From 9e1c7290a87efeaeeeecd6da137399c7107da5ee Mon Sep 17 00:00:00 2001 From: aggresss Date: Thu, 2 Nov 2023 10:14:31 +0800 Subject: [PATCH] 2023-11-02 10:14:31 CST W44D4 --- avcodec.go | 49 +---- avcodec_codec.go | 1 - avcodec_codec_id.go | 15 -- avcodec_packet.go | 5 - avdevice.go | 4 - avfilter.go | 45 ----- avformat.go | 3 - avutil_adler32.go | 6 +- avutil_avstring.go | 7 +- avutil_buffer.go | 7 +- avutil_channel_layout.go | 6 - avutil_cpu.go | 3 - avutil_film_grain_params.go | 373 ------------------------------------ avutil_frame.go | 2 - avutil_imgutils.go | 12 -- avutil_log.go | 6 - avutil_opt.go | 7 - avutil_pixfmt.go | 7 +- avutil_timecode.go | 23 --- avutil_tx.go | 7 - avutil_video_enc_params.go | 7 +- 21 files changed, 11 insertions(+), 584 deletions(-) delete mode 100644 avutil_film_grain_params.go diff --git a/avcodec.go b/avcodec.go index f14fcea..48e42d7 100644 --- a/avcodec.go +++ b/avcodec.go @@ -18,9 +18,6 @@ typedef int (*avcodec_context_get_buffer2_func)(struct AVCodecContext *s, AVFram typedef void (*avcodec_context_rtp_callback_func)(struct AVCodecContext *avctx, void *data, int size, int mb_nb); -typedef int (*avcodec_context_get_encode_buffer_func)(struct AVCodecContext *s, - AVPacket *pkt, int flags); - typedef int (*avcodec_context_execute_func)(AVCodecContext *c2, void *arg2); typedef int (*avcodec_context_internal_execute_func)(struct AVCodecContext *c, @@ -129,7 +126,6 @@ const ( AV_CODEC_EXPORT_DATA_MVS = C.AV_CODEC_EXPORT_DATA_MVS AV_CODEC_EXPORT_DATA_PRFT = C.AV_CODEC_EXPORT_DATA_PRFT AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS = C.AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS - AV_CODEC_EXPORT_DATA_FILM_GRAIN = C.AV_CODEC_EXPORT_DATA_FILM_GRAIN ) // Pan Scan area. @@ -320,8 +316,7 @@ func (prt *AVProducerReferenceTime) GetFlagsAddr() *int32 { } const ( - AV_GET_BUFFER_FLAG_REF = C.AV_GET_BUFFER_FLAG_REF - AV_GET_ENCODE_BUFFER_FLAG_REF = C.AV_GET_ENCODE_BUFFER_FLAG_REF + AV_GET_BUFFER_FLAG_REF = C.AV_GET_BUFFER_FLAG_REF ) // AvCodecContext is main external API structure. @@ -2860,22 +2855,16 @@ func (avctx *AVCodecContext) GetActiveThreadTypeAddr() *int32 { return (*int32)(&avctx.active_thread_type) } -// Deprecated: Unused. -// // GetThreadSafeCallbacks gets `AVCodecContext.thread_safe_callbacks` value. func (avctx *AVCodecContext) GetThreadSafeCallbacks() int32 { return (int32)(avctx.thread_safe_callbacks) } -// Deprecated: Unused. -// // SetThreadSafeCallbacks sets `AVCodecContext.thread_safe_callbacks` value. func (avctx *AVCodecContext) SetThreadSafeCallbacks(v int32) { avctx.thread_safe_callbacks = (C.int)(v) } -// Deprecated: Unused. -// // GetThreadSafeCallbacksAddr gets `AVCodecContext.thread_safe_callbacks` address. func (avctx *AVCodecContext) GetThreadSafeCallbacksAddr() *int32 { return (*int32)(&avctx.thread_safe_callbacks) @@ -3042,9 +3031,6 @@ const ( FF_PROFILE_HEVC_MAIN_STILL_PICTURE = int32(C.FF_PROFILE_HEVC_MAIN_STILL_PICTURE) FF_PROFILE_HEVC_REXT = int32(C.FF_PROFILE_HEVC_REXT) - FF_PROFILE_VVC_MAIN_10 = int32(C.FF_PROFILE_VVC_MAIN_10) - FF_PROFILE_VVC_MAIN_10_444 = int32(C.FF_PROFILE_VVC_MAIN_10_444) - FF_PROFILE_AV1_MAIN = int32(C.FF_PROFILE_AV1_MAIN) FF_PROFILE_AV1_HIGH = int32(C.FF_PROFILE_AV1_HIGH) FF_PROFILE_AV1_PROFESSIONAL = int32(C.FF_PROFILE_AV1_PROFESSIONAL) @@ -3395,22 +3381,16 @@ func (avctx *AVCodecContext) GetSeekPrerollAddr() *int32 { return (*int32)(&avctx.seek_preroll) } -// Deprecated: Unused. -// // GetDebugMv gets `AVCodecContext.debug_mv` value. func (avctx *AVCodecContext) GetDebugMv() int32 { return (int32)(avctx.debug_mv) } -// Deprecated: Unused. -// // SetDebugMv sets `AVCodecContext.debug_mv` value. func (avctx *AVCodecContext) SetDebugMv(v int32) { avctx.debug_mv = (C.int)(v) } -// Deprecated: Unused. -// // GetDebugMvAddr gets `AVCodecContext.debug_mv` address. func (avctx *AVCodecContext) GetDebugMvAddr() *int32 { return (*int32)(&avctx.debug_mv) @@ -3677,25 +3657,6 @@ func (avctx *AVCodecContext) GetExportSideDataAddr() *int32 { return (*int32)(&avctx.export_side_data) } -// typedef int (*avcodec_context_get_encode_buffer_func)(struct AVCodecContext *s, -// AvPacket *pkt, int flags); -type AVCodecContextGetEncodeBufferFunc = C.avcodec_context_get_encode_buffer_func - -// GetGetEncodeBuffer gets `AVCodecContext.get_encode_buffer` value. -func (avctx *AVCodecContext) GetGetEncodeBuffer() AVCodecContextGetEncodeBufferFunc { - return (AVCodecContextGetEncodeBufferFunc)(avctx.get_encode_buffer) -} - -// SetGetEncodeBuffer sets `AVCodecContext.get_encode_buffer` value. -func (avctx *AVCodecContext) SetGetEncodeBuffer(v AVCodecContextGetEncodeBufferFunc) { - avctx.get_encode_buffer = (C.avcodec_context_get_encode_buffer_func)(v) -} - -// GetGetEncodeBufferAddr gets `AVCodecContext.get_encode_buffer` address. -func (avctx *AVCodecContext) GetGetEncodeBufferAddr() *AVCodecContextGetEncodeBufferFunc { - return (*AVCodecContextGetEncodeBufferFunc)(&avctx.get_encode_buffer) -} - // Deprecated: No use. // // AvCodecGetPktTimebase @@ -4237,8 +4198,6 @@ func AvCodecGetClass() *AVClass { return (*AVClass)(C.avcodec_get_class()) } -// Deprecated: This function should not be used. -// // AvCodecGetFrameClass func AvCodecGetFrameClass() *AVClass { return (*AVClass)(C.avcodec_get_frame_class()) @@ -4298,12 +4257,6 @@ func AvCodecDefaultGetBuffer2(avctx *AVCodecContext, frame *AVFrame, flags int32 (*C.struct_AVFrame)(frame), (C.int)(flags))) } -// The default callback for AVCodecContext.get_encode_buffer(). -func AvCodecDefaultGetEncodeBuffer(avctx *AVCodecContext, pkt *AVPacket, flags int32) int32 { - return (int32)(C.avcodec_default_get_encode_buffer((*C.struct_AVCodecContext)(avctx), - (*C.struct_AVPacket)(pkt), (C.int)(flags))) -} - // AvCodecAlignDimensions modifies width and height values so that they will result in a memory // buffer that is acceptable for the codec if you do not use any horizontal padding. func AvCodecAlignDimensions(avctx *AVCodecContext, width, height *int32) { diff --git a/avcodec_codec.go b/avcodec_codec.go index 8949dbb..a2fb40e 100644 --- a/avcodec_codec.go +++ b/avcodec_codec.go @@ -21,7 +21,6 @@ const ( AV_CODEC_CAP_FRAME_THREADS = C.AV_CODEC_CAP_FRAME_THREADS AV_CODEC_CAP_SLICE_THREADS = C.AV_CODEC_CAP_SLICE_THREADS AV_CODEC_CAP_PARAM_CHANGE = C.AV_CODEC_CAP_PARAM_CHANGE - AV_CODEC_CAP_OTHER_THREADS = C.AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS = C.AV_CODEC_CAP_AUTO_THREADS AV_CODEC_CAP_VARIABLE_FRAME_SIZE = C.AV_CODEC_CAP_VARIABLE_FRAME_SIZE AV_CODEC_CAP_AVOID_PROBING = C.AV_CODEC_CAP_AVOID_PROBING diff --git a/avcodec_codec_id.go b/avcodec_codec_id.go index 688a4d4..53abe64 100644 --- a/avcodec_codec_id.go +++ b/avcodec_codec_id.go @@ -210,11 +210,6 @@ const ( AV_CODEC_ID_SCREENPRESSO = AVCodecID(C.AV_CODEC_ID_SCREENPRESSO) AV_CODEC_ID_RSCC = AVCodecID(C.AV_CODEC_ID_RSCC) AV_CODEC_ID_AVS2 = AVCodecID(C.AV_CODEC_ID_AVS2) - AV_CODEC_ID_PGX = AVCodecID(C.AV_CODEC_ID_PGX) - AV_CODEC_ID_AVS3 = AVCodecID(C.AV_CODEC_ID_AVS3) - AV_CODEC_ID_MSP2 = AVCodecID(C.AV_CODEC_ID_MSP2) - AV_CODEC_ID_VVC = AVCodecID(C.AV_CODEC_ID_VVC) - AV_CODEC_ID_H266 = AVCodecID(C.AV_CODEC_ID_H266) AV_CODEC_ID_Y41P = AVCodecID(C.AV_CODEC_ID_Y41P) AV_CODEC_ID_AVRP = AVCodecID(C.AV_CODEC_ID_AVRP) AV_CODEC_ID_012V = AVCodecID(C.AV_CODEC_ID_012V) @@ -268,13 +263,6 @@ const ( AV_CODEC_ID_MV30 = AVCodecID(C.AV_CODEC_ID_MV30) AV_CODEC_ID_NOTCHLC = AVCodecID(C.AV_CODEC_ID_NOTCHLC) AV_CODEC_ID_PFM = AVCodecID(C.AV_CODEC_ID_PFM) - AV_CODEC_ID_MOBICLIP = AVCodecID(C.AV_CODEC_ID_MOBICLIP) - AV_CODEC_ID_PHOTOCD = AVCodecID(C.AV_CODEC_ID_PHOTOCD) - AV_CODEC_ID_IPU = AVCodecID(C.AV_CODEC_ID_IPU) - AV_CODEC_ID_ARGO = AVCodecID(C.AV_CODEC_ID_ARGO) - AV_CODEC_ID_CRI = AVCodecID(C.AV_CODEC_ID_CRI) - AV_CODEC_ID_SIMBIOSIS_IMX = AVCodecID(C.AV_CODEC_ID_SIMBIOSIS_IMX) - AV_CODEC_ID_SGA_VIDEO = AVCodecID(C.AV_CODEC_ID_SGA_VIDEO) // various PCM "codecs" AV_CODEC_ID_FIRST_AUDIO = AVCodecID(C.AV_CODEC_ID_FIRST_AUDIO) @@ -314,7 +302,6 @@ const ( AV_CODEC_ID_PCM_F16LE = AVCodecID(C.AV_CODEC_ID_PCM_F16LE) AV_CODEC_ID_PCM_F24LE = AVCodecID(C.AV_CODEC_ID_PCM_F24LE) AV_CODEC_ID_PCM_VIDC = AVCodecID(C.AV_CODEC_ID_PCM_VIDC) - AV_CODEC_ID_PCM_SGA = AVCodecID(C.AV_CODEC_ID_PCM_SGA) // various ADPCM codecs AV_CODEC_ID_ADPCM_IMA_QT = AVCodecID(C.AV_CODEC_ID_ADPCM_IMA_QT) @@ -366,7 +353,6 @@ const ( AV_CODEC_ID_ADPCM_IMA_ALP = AVCodecID(C.AV_CODEC_ID_ADPCM_IMA_ALP) AV_CODEC_ID_ADPCM_IMA_MTF = AVCodecID(C.AV_CODEC_ID_ADPCM_IMA_MTF) AV_CODEC_ID_ADPCM_IMA_CUNNING = AVCodecID(C.AV_CODEC_ID_ADPCM_IMA_CUNNING) - AV_CODEC_ID_ADPCM_IMA_MOFLEX = AVCodecID(C.AV_CODEC_ID_ADPCM_IMA_MOFLEX) // AMR AV_CODEC_ID_AMR_NB = AVCodecID(C.AV_CODEC_ID_AMR_NB) @@ -482,7 +468,6 @@ const ( AV_CODEC_ID_MPEGH_3D_AUDIO = AVCodecID(C.AV_CODEC_ID_MPEGH_3D_AUDIO) AV_CODEC_ID_SIREN = AVCodecID(C.AV_CODEC_ID_SIREN) AV_CODEC_ID_HCA = AVCodecID(C.AV_CODEC_ID_HCA) - AV_CODEC_ID_FASTAUDIO = AVCodecID(C.AV_CODEC_ID_FASTAUDIO) // subtitle codecs AV_CODEC_ID_FIRST_SUBTITLE = AVCodecID(C.AV_CODEC_ID_FIRST_SUBTITLE) diff --git a/avcodec_packet.go b/avcodec_packet.go index 1db44e2..717347c 100644 --- a/avcodec_packet.go +++ b/avcodec_packet.go @@ -44,7 +44,6 @@ const ( AV_PKT_DATA_PRFT = AVPacketSideDataType(C.AV_PKT_DATA_PRFT) AV_PKT_DATA_ICC_PROFILE = AVPacketSideDataType(C.AV_PKT_DATA_ICC_PROFILE) AV_PKT_DATA_DOVI_CONF = AVPacketSideDataType(C.AV_PKT_DATA_DOVI_CONF) - AV_PKT_DATA_S12M_TIMECODE = AVPacketSideDataType(C.AV_PKT_DATA_S12M_TIMECODE) AV_PKT_DATA_NB = AVPacketSideDataType(C.AV_PKT_DATA_NB) ) @@ -290,8 +289,6 @@ func (pkt *AVPacket) GetConvergenceDurationAddr() *int64 { return (*int64)(&pkt.convergence_duration) } -// Deprecated: No use. -// // AVPacketList type AVPacketList C.struct_AVPacketList @@ -345,8 +342,6 @@ func AvPacketFree(pkt **AVPacket) { C.av_packet_free((**C.struct_AVPacket)(unsafe.Pointer(pkt))) } -// Deprecated: No use. -// // AvInitPacket initializes optional fields of a packet with default values. func AvInitPacket(pkt *AVPacket) { C.av_init_packet((*C.struct_AVPacket)(pkt)) diff --git a/avdevice.go b/avdevice.go index 81a158b..9bf7ba7 100644 --- a/avdevice.go +++ b/avdevice.go @@ -362,8 +362,6 @@ func (dc *AVDeviceCapabilitiesQuery) GetFpsAddr() *AVRational { // NONEED: av_device_capabilities -// Deprecated: No use. -// // AvDeviceCapabilitiesCreate initializes capabilities probing API based on AVOption API. func AvDeviceCapabilitiesCreate(caps **AVDeviceCapabilitiesQuery, s *AVFormatContext, deviceOptions **AVDictionary) int32 { @@ -371,8 +369,6 @@ func AvDeviceCapabilitiesCreate(caps **AVDeviceCapabilitiesQuery, (*C.struct_AVFormatContext)(s), (**C.struct_AVDictionary)(unsafe.Pointer(deviceOptions)))) } -// Deprecated: No use. -// // AvDeviceCapabilitiesFree frees resources created by AvDeviceCapabilitiesCreate() func AvDeviceCapabilitiesFree(caps **AVDeviceCapabilitiesQuery, s *AVFormatContext) { C.avdevice_capabilities_free((**C.struct_AVDeviceCapabilitiesQuery)(unsafe.Pointer(caps)), diff --git a/avfilter.go b/avfilter.go index a498836..56c1ebf 100644 --- a/avfilter.go +++ b/avfilter.go @@ -471,51 +471,6 @@ func (fltc *AVFilterContext) GetExtraHwFramesAddr() *int32 { // AVFilterFormatsConfig type AVFilterFormatsConfig C.struct_AVFilterFormatsConfig -// GetFormats gets `AVFilterFormatsConfig.formats` value. -func (fltf *AVFilterFormatsConfig) GetFormats() *AVFilterFormats { - return (*AVFilterFormats)(fltf.formats) -} - -// SetFormats sets `AVFilterFormatsConfig.formats` value. -func (fltf *AVFilterFormatsConfig) SetFormats(v *AVFilterFormats) { - fltf.formats = (*C.struct_AVFilterFormats)(v) -} - -// GetFormatsAddr gets `AVFilterFormatsConfig.formats` address. -func (fltf *AVFilterFormatsConfig) GetFormatsAddr() **AVFilterFormats { - return (**AVFilterFormats)(unsafe.Pointer(&fltf.formats)) -} - -// GetSamplerates gets `AVFilterFormatsConfig.samplerates` value. -func (fltf *AVFilterFormatsConfig) GetSamplerates() *AVFilterFormats { - return (*AVFilterFormats)(fltf.samplerates) -} - -// SetSamplerates sets `AVFilterFormatsConfig.samplerates` value. -func (fltf *AVFilterFormatsConfig) SetSamplerates(v *AVFilterFormats) { - fltf.samplerates = (*C.struct_AVFilterFormats)(v) -} - -// GetSampleratesAddr gets `AVFilterFormatsConfig.samplerates` address. -func (fltf *AVFilterFormatsConfig) GetSampleratesAddr() **AVFilterFormats { - return (**AVFilterFormats)(unsafe.Pointer(&fltf.samplerates)) -} - -// GetChannelLayouts gets `AVFilterFormatsConfig.channel_layouts` value. -func (fltf *AVFilterFormatsConfig) GetChannelLayouts() *AVFilterChannelLayouts { - return (*AVFilterChannelLayouts)(fltf.channel_layouts) -} - -// SetChannelLayouts sets `AVFilterFormatsConfig.channel_layouts` value. -func (fltf *AVFilterFormatsConfig) SetChannelLayouts(v *AVFilterChannelLayouts) { - fltf.channel_layouts = (*C.struct_AVFilterChannelLayouts)(v) -} - -// GetChannelLayoutsAddr gets `AVFilterFormatsConfig.channel_layouts` address. -func (fltf *AVFilterFormatsConfig) GetChannelLayoutsAddr() **AVFilterChannelLayouts { - return (**AVFilterChannelLayouts)(unsafe.Pointer(&fltf.channel_layouts)) -} - // AVFilterLink type AVFilterLink C.struct_AVFilterLink diff --git a/avformat.go b/avformat.go index 68363c0..354f959 100644 --- a/avformat.go +++ b/avformat.go @@ -658,7 +658,6 @@ func (stm *AVStream) GetEventFlagsAddr() *int32 { const ( AVSTREAM_EVENT_FLAG_METADATA_UPDATED = int32(C.AVSTREAM_EVENT_FLAG_METADATA_UPDATED) - AVSTREAM_EVENT_FLAG_NEW_PACKETS = int32(C.AVSTREAM_EVENT_FLAG_NEW_PACKETS) ) // GetRFrameRate gets `AVStream.r_frame_rate` value. @@ -2414,8 +2413,6 @@ func AvFormatOpenInput(ps **AVFormatContext, url string, fmt *AVInputFormat, opt (*C.char)(urlPtr), (*C.struct_AVInputFormat)(fmt), (**C.struct_AVDictionary)(unsafe.Pointer(options)))) } -// Deprecated: Use an AVDictionary to pass options to a demuxer. -// // AvDemuxerOpen func AvDemuxerOpen(ic *AVFormatContext) int32 { return (int32)(C.av_demuxer_open((*C.struct_AVFormatContext)(ic))) diff --git a/avutil_adler32.go b/avutil_adler32.go index b25d810..27f3d04 100644 --- a/avutil_adler32.go +++ b/avutil_adler32.go @@ -9,9 +9,7 @@ package ffmpeg */ import "C" -type AVAdler = C.AVAdler - // AvAdler32Update calculates the Adler32 checksum of a buffer. -func AvAdler32Update(adler AVAdler, buf *uint8, len uint32) AVAdler { - return (AVAdler)(C.av_adler32_update((C.AVAdler)(adler), (*C.uint8_t)(buf), (C.uint)(len))) +func AvAdler32Update(adler uint32, buf *uint8, len uint32) uint32 { + return (uint32)(C.av_adler32_update((C.ulong)(adler), (*C.uint8_t)(buf), (C.uint)(len))) } diff --git a/avutil_avstring.go b/avutil_avstring.go index f4872e1..2c40691 100644 --- a/avutil_avstring.go +++ b/avutil_avstring.go @@ -63,14 +63,11 @@ const ( AV_ESCAPE_MODE_AUTO = C.AV_ESCAPE_MODE_AUTO AV_ESCAPE_MODE_BACKSLASH = C.AV_ESCAPE_MODE_BACKSLASH AV_ESCAPE_MODE_QUOTE = C.AV_ESCAPE_MODE_QUOTE - AV_ESCAPE_MODE_XML = C.AV_ESCAPE_MODE_XML ) const ( - AV_ESCAPE_FLAG_WHITESPACE = C.AV_ESCAPE_FLAG_WHITESPACE - AV_ESCAPE_FLAG_STRICT = C.AV_ESCAPE_FLAG_STRICT - AV_ESCAPE_FLAG_XML_SINGLE_QUOTES = C.AV_ESCAPE_FLAG_XML_SINGLE_QUOTES - AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES = C.AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES + AV_ESCAPE_FLAG_WHITESPACE = C.AV_ESCAPE_FLAG_WHITESPACE + AV_ESCAPE_FLAG_STRICT = C.AV_ESCAPE_FLAG_STRICT ) // NONEED: av_escape diff --git a/avutil_buffer.go b/avutil_buffer.go index 74474a9..1440ed7 100644 --- a/avutil_buffer.go +++ b/avutil_buffer.go @@ -102,12 +102,7 @@ func AvBufferRealloc(buf **AVBufferRef, size int32) int32 { return (int32)(C.av_buffer_realloc((**C.struct_AVBufferRef)(unsafe.Pointer(buf)), (C.int)(size))) } -// AvBufferReplace ensures dst refers to the same data as src. -func AvBufferReplace(dst **AVBufferRef, src *AVBufferRef) int32 { - return (int32)(C.av_buffer_replace((**C.struct_AVBufferRef)(unsafe.Pointer(dst)), - (*C.struct_AVBufferRef)(src))) -} - +// AVBufferPool type AVBufferPool C.struct_AVBufferPool // typedef AVBufferRef* (*av_buffer_pool_alloc_func)(int size) diff --git a/avutil_channel_layout.go b/avutil_channel_layout.go index 54e39f3..8604e08 100644 --- a/avutil_channel_layout.go +++ b/avutil_channel_layout.go @@ -36,11 +36,6 @@ const ( AV_CH_SURROUND_DIRECT_LEFT = uint64(C.AV_CH_SURROUND_DIRECT_LEFT) AV_CH_SURROUND_DIRECT_RIGHT = uint64(C.AV_CH_SURROUND_DIRECT_RIGHT) AV_CH_LOW_FREQUENCY_2 = uint64(C.AV_CH_LOW_FREQUENCY_2) - AV_CH_TOP_SIDE_LEFT = uint64(C.AV_CH_TOP_SIDE_LEFT) - AV_CH_TOP_SIDE_RIGHT = uint64(C.AV_CH_TOP_SIDE_RIGHT) - AV_CH_BOTTOM_FRONT_CENTER = uint64(C.AV_CH_BOTTOM_FRONT_CENTER) - AV_CH_BOTTOM_FRONT_LEFT = uint64(C.AV_CH_BOTTOM_FRONT_LEFT) - AV_CH_BOTTOM_FRONT_RIGHT = uint64(C.AV_CH_BOTTOM_FRONT_RIGHT) AV_CH_LAYOUT_NATIVE = uint64(C.AV_CH_LAYOUT_NATIVE) ) @@ -74,7 +69,6 @@ const ( AV_CH_LAYOUT_OCTAGONAL = uint64(C.AV_CH_LAYOUT_OCTAGONAL) AV_CH_LAYOUT_HEXADECAGONAL = uint64(C.AV_CH_LAYOUT_HEXADECAGONAL) AV_CH_LAYOUT_STEREO_DOWNMIX = uint64(C.AV_CH_LAYOUT_STEREO_DOWNMIX) - AV_CH_LAYOUT_22POINT2 = uint64(C.AV_CH_LAYOUT_22POINT2) ) type AVMatrixEncoding = C.enum_AVMatrixEncoding diff --git a/avutil_cpu.go b/avutil_cpu.go index 010a683..a48d2fc 100644 --- a/avutil_cpu.go +++ b/avutil_cpu.go @@ -53,9 +53,6 @@ const ( AV_CPU_FLAG_ARMV8 = C.AV_CPU_FLAG_ARMV8 AV_CPU_FLAG_VFP_VM = C.AV_CPU_FLAG_VFP_VM AV_CPU_FLAG_SETEND = C.AV_CPU_FLAG_SETEND - - AV_CPU_FLAG_MMI = C.AV_CPU_FLAG_MMI - AV_CPU_FLAG_MSA = C.AV_CPU_FLAG_MSA ) // AvGetCpuFlags returns the flags which specify extensions supported by the CPU. diff --git a/avutil_film_grain_params.go b/avutil_film_grain_params.go deleted file mode 100644 index 992516b..0000000 --- a/avutil_film_grain_params.go +++ /dev/null @@ -1,373 +0,0 @@ -// Copyright (c) 2023 QRTC. All rights reserved. -// Use of this source code is governed by a MIT -// license that can be found in the LICENSE file. - -package ffmpeg - -/* -#include - -AVFilmGrainAOMParams get_av_film_grain_params_codec_aom(AVFilmGrainParams *v) { - return v->codec.aom; -} - -void set_av_film_grain_params_codec_aom(AVFilmGrainParams *v, AVFilmGrainAOMParams p) { - v->codec.aom = p; -} - -AVFilmGrainAOMParams* get_av_film_grain_params_codec_aom_addr(AVFilmGrainParams *v) { - return &v->codec.aom; -} -*/ -import "C" -import "unsafe" - -// AVFilmGrainParamsType -type AVFilmGrainParamsType = C.enum_AVFilmGrainParamsType - -const ( - AV_FILM_GRAIN_PARAMS_NONE = AVFilmGrainParamsType(C.AV_FILM_GRAIN_PARAMS_NONE) - AV_FILM_GRAIN_PARAMS_AV1 = AVFilmGrainParamsType(C.AV_FILM_GRAIN_PARAMS_AV1) -) - -// AVFilmGrainAOMParams -type AVFilmGrainAOMParams C.struct_AVFilmGrainAOMParams - -// GetNumYPoints gets `AVFilmGrainAOMParams.num_y_points` value. -func (aomp *AVFilmGrainAOMParams) GetNumYPoints() int32 { - return (int32)(aomp.num_y_points) -} - -// SetNumYPoints sets `AVFilmGrainAOMParams.num_y_points` value. -func (aomp *AVFilmGrainAOMParams) SetNumYPoints(v int32) { - aomp.num_y_points = (C.int)(v) -} - -// GetNumYPointsAddr gets `AVFilmGrainAOMParams.num_y_points` address. -func (aomp *AVFilmGrainAOMParams) GetNumYPointsAddr() *int32 { - return (*int32)(&aomp.num_y_points) -} - -// GetYPoints gets `AVFilmGrainAOMParams.y_points` value. -func (aomp *AVFilmGrainAOMParams) GetYPoints() (v [][]uint8) { - for i := 0; i < 14; i++ { - v = append(v, unsafe.Slice((*uint8)(&aomp.y_points[i][0]), 2)) - } - return v -} - -// SetYPoints sets `AVFilmGrainAOMParams.y_points` value. -func (aomp *AVFilmGrainAOMParams) SetYPoints(v [][]uint8) { - for i := 0; i < FFMIN(len(v), 14); i++ { - for j := 0; j < FFMIN(len(v[i]), 2); j++ { - aomp.y_points[i][j] = (C.uint8_t)(v[i][j]) - } - } -} - -// GetYPointsAddr gets `AVFilmGrainAOMParams.y_points` address. -func (aomp *AVFilmGrainAOMParams) GetYPointsAddr() **uint8 { - return (**uint8)(unsafe.Pointer(&aomp.y_points)) -} - -// GetChromaScalingFromLuma gets `AVFilmGrainAOMParams.chroma_scaling_from_luma` value. -func (aomp *AVFilmGrainAOMParams) GetChromaScalingFromLuma() int32 { - return (int32)(aomp.chroma_scaling_from_luma) -} - -// SetChromaScalingFromLuma sets `AVFilmGrainAOMParams.chroma_scaling_from_luma` value. -func (aomp *AVFilmGrainAOMParams) SetChromaScalingFromLuma(v int32) { - aomp.chroma_scaling_from_luma = (C.int)(v) -} - -// GetChromaScalingFromLumaAddr gets `AVFilmGrainAOMParams.chroma_scaling_from_luma` address. -func (aomp *AVFilmGrainAOMParams) GetChromaScalingFromLumaAddr() *int32 { - return (*int32)(&aomp.chroma_scaling_from_luma) -} - -// GetNumUvPoints gets `AVFilmGrainAOMParams.num_uv_points` value. -func (aomp *AVFilmGrainAOMParams) GetNumUvPoints() []int32 { - return unsafe.Slice((*int32)(&aomp.num_uv_points[0]), 2) -} - -// SetNumUvPoints sets `AVFilmGrainAOMParams.num_uv_points` value. -func (aomp *AVFilmGrainAOMParams) SetNumUvPoints(v []int32) { - for i := 0; i < FFMIN(len(v), 2); i++ { - aomp.num_uv_points[i] = (C.int)(v[i]) - } -} - -// GetNumUvPointsAddr gets `AVFilmGrainAOMParams.num_uv_points` address. -func (aomp *AVFilmGrainAOMParams) GetNumUvPointsAddr() **int32 { - return (**int32)(unsafe.Pointer(&aomp.num_uv_points)) -} - -// GetUvPoints gets `AVFilmGrainAOMParams.uv_points` value. -func (aomp *AVFilmGrainAOMParams) GetUvPoints() (v [][][]uint8) { - for i := 0; i < 2; i++ { - tmp := [][]uint8{} - for j := 0; j < 10; j++ { - tmp = append(tmp, unsafe.Slice((*uint8)(&aomp.uv_points[i][j][0]), 2)) - } - v = append(v, tmp) - } - return v -} - -// SetUvPoints sets `AVFilmGrainAOMParams.uv_points` value. -func (aomp *AVFilmGrainAOMParams) SetUvPoints(v [][][]uint8) { - for i := 0; i < FFMIN(len(v), 2); i++ { - for j := 0; j < FFMIN(len(v[i]), 10); j++ { - for k := 0; k < FFMIN(len(v[i][j]), 2); k++ { - aomp.uv_points[i][j][k] = (C.uint8_t)(v[i][j][k]) - } - } - } -} - -// GetUvPointsAddr gets `AVFilmGrainAOMParams.uv_points` address. -func (aomp *AVFilmGrainAOMParams) GetUvPointsAddr() **uint8 { - return (**uint8)(unsafe.Pointer(&aomp.uv_points)) -} - -// GetScalingShift gets `AVFilmGrainAOMParams.scaling_shift` value. -func (aomp *AVFilmGrainAOMParams) GetScalingShift() int32 { - return (int32)(aomp.scaling_shift) -} - -// SetScalingShift sets `AVFilmGrainAOMParams.scaling_shift` value. -func (aomp *AVFilmGrainAOMParams) SetScalingShift(v int32) { - aomp.scaling_shift = (C.int)(v) -} - -// GetScalingShiftAddr gets `AVFilmGrainAOMParams.scaling_shift` address. -func (aomp *AVFilmGrainAOMParams) GetScalingShiftAddr() *int32 { - return (*int32)(&aomp.scaling_shift) -} - -// GetArCoeffLag gets `AVFilmGrainAOMParams.ar_coeff_lag` value. -func (aomp *AVFilmGrainAOMParams) GetArCoeffLag() int32 { - return (int32)(aomp.ar_coeff_lag) -} - -// SetArCoeffLag sets `AVFilmGrainAOMParams.ar_coeff_lag` value. -func (aomp *AVFilmGrainAOMParams) SetArCoeffLag(v int32) { - aomp.ar_coeff_lag = (C.int)(v) -} - -// GetArCoeffLagAddr gets `AVFilmGrainAOMParams.ar_coeff_lag` address. -func (aomp *AVFilmGrainAOMParams) GetArCoeffLagAddr() *int32 { - return (*int32)(&aomp.ar_coeff_lag) -} - -// GetArCoeffsY gets `AVFilmGrainAOMParams.ar_coeffs_y` value. -func (aomp *AVFilmGrainAOMParams) GetArCoeffsY() []int8 { - return unsafe.Slice((*int8)(&aomp.ar_coeffs_y[0]), 24) -} - -// SetArCoeffsY sets `AVFilmGrainAOMParams.ar_coeffs_y` value. -func (aomp *AVFilmGrainAOMParams) SetArCoeffsY(v []int8) { - for i := 0; i < FFMIN(len(v), 24); i++ { - aomp.ar_coeffs_y[i] = (C.int8_t)(v[i]) - } -} - -// GetArCoeffsYAddr gets `AVFilmGrainAOMParams.ar_coeffs_y` address. -func (aomp *AVFilmGrainAOMParams) GetArCoeffsYAddr() **int8 { - return (**int8)(unsafe.Pointer(&aomp.ar_coeffs_y)) -} - -// GetArCoeffsUv gets `AVFilmGrainAOMParams.ar_coeffs_uv` value. -func (aomp *AVFilmGrainAOMParams) GetArCoeffsUv() (v [][]int8) { - for i := 0; i < 2; i++ { - v = append(v, unsafe.Slice((*int8)(&aomp.ar_coeffs_uv[i][0]), 25)) - } - return v -} - -// SetArCoeffsUv sets `AVFilmGrainAOMParams.ar_coeffs_uv` value. -func (aomp *AVFilmGrainAOMParams) SetArCoeffsUv(v [][]int8) { - for i := 0; i < FFMIN(len(v), 2); i++ { - for j := 0; j < FFMIN(len(v[i]), 25); j++ { - aomp.ar_coeffs_uv[i][j] = (C.int8_t)(v[i][j]) - } - } -} - -// GetArCoeffsUvAddr gets `AVFilmGrainAOMParams.ar_coeffs_uv` address. -func (aomp *AVFilmGrainAOMParams) GetArCoeffsUvAddr() **int8 { - return (**int8)(unsafe.Pointer(&aomp.ar_coeffs_uv)) -} - -// GetArCoeffShift gets `AVFilmGrainAOMParams.ar_coeff_shift` value. -func (aomp *AVFilmGrainAOMParams) GetArCoeffShift() int32 { - return (int32)(aomp.ar_coeff_shift) -} - -// SetArCoeffShift sets `AVFilmGrainAOMParams.ar_coeff_shift` value. -func (aomp *AVFilmGrainAOMParams) SetArCoeffShift(v int32) { - aomp.ar_coeff_shift = (C.int)(v) -} - -// GetArCoeffShiftAddr gets `AVFilmGrainAOMParams.ar_coeff_shift` address. -func (aomp *AVFilmGrainAOMParams) GetArCoeffShiftAddr() *int32 { - return (*int32)(&aomp.ar_coeff_shift) -} - -// GetGrainScaleShift gets `AVFilmGrainAOMParams.grain_scale_shift` value. -func (aomp *AVFilmGrainAOMParams) GetGrainScaleShift() int32 { - return (int32)(aomp.grain_scale_shift) -} - -// SetGrainScaleShift sets `AVFilmGrainAOMParams.grain_scale_shift` value. -func (aomp *AVFilmGrainAOMParams) SetGrainScaleShift(v int32) { - aomp.grain_scale_shift = (C.int)(v) -} - -// GetGrainScaleShiftAddr gets `AVFilmGrainAOMParams.grain_scale_shift` address. -func (aomp *AVFilmGrainAOMParams) GetGrainScaleShiftAddr() *int32 { - return (*int32)(&aomp.grain_scale_shift) -} - -// GetUvMult gets `AVFilmGrainAOMParams.uv_mult` value. -func (aomp *AVFilmGrainAOMParams) GetUvMult() []int32 { - return unsafe.Slice((*int32)(&aomp.uv_mult[0]), 2) -} - -// SetUvMult sets `AVFilmGrainAOMParams.uv_mult` value. -func (aomp *AVFilmGrainAOMParams) SetUvMult(v []int32) { - for i := 0; i < FFMIN(len(v), 2); i++ { - aomp.uv_mult[i] = (C.int)(v[i]) - } -} - -// GetUvMultAddr gets `AVFilmGrainAOMParams.uv_mult` address. -func (aomp *AVFilmGrainAOMParams) GetUvMultAddr() **int32 { - return (**int32)(unsafe.Pointer(&aomp.uv_mult)) -} - -// GetUvMultLuma gets `AVFilmGrainAOMParams.uv_mult_luma` value. -func (aomp *AVFilmGrainAOMParams) GetUvMultLuma() []int32 { - return unsafe.Slice((*int32)(&aomp.uv_mult_luma[0]), 2) -} - -// SetUvMultLuma sets `AVFilmGrainAOMParams.uv_mult_luma` value. -func (aomp *AVFilmGrainAOMParams) SetUvMultLuma(v []int32) { - for i := 0; i < FFMIN(len(v), 2); i++ { - aomp.uv_mult_luma[i] = (C.int)(v[i]) - } -} - -// GetUvMultLumaAddr gets `AVFilmGrainAOMParams.uv_mult_luma` address. -func (aomp *AVFilmGrainAOMParams) GetUvMultLumaAddr() **int32 { - return (**int32)(unsafe.Pointer(&aomp.uv_mult_luma)) -} - -// GetUvOffset gets `AVFilmGrainAOMParams.uv_offset` value. -func (aomp *AVFilmGrainAOMParams) GetUvOffset() []int32 { - return unsafe.Slice((*int32)(&aomp.uv_offset[0]), 2) -} - -// SetUvOffset sets `AVFilmGrainAOMParams.uv_offset` value. -func (aomp *AVFilmGrainAOMParams) SetUvOffset(v []int32) { - for i := 0; i < FFMIN(len(v), 2); i++ { - aomp.uv_offset[i] = (C.int)(v[i]) - } -} - -// GetUvOffsetAddr gets `AVFilmGrainAOMParams.uv_offset` address. -func (aomp *AVFilmGrainAOMParams) GetUvOffsetAddr() **int32 { - return (**int32)(unsafe.Pointer(&aomp.uv_offset)) -} - -// GetOverlapFlag gets `AVFilmGrainAOMParams.overlap_flag` value. -func (aomp *AVFilmGrainAOMParams) GetOverlapFlag() int32 { - return (int32)(aomp.overlap_flag) -} - -// SetOverlapFlag sets `AVFilmGrainAOMParams.overlap_flag` value. -func (aomp *AVFilmGrainAOMParams) SetOverlapFlag(v int32) { - aomp.overlap_flag = (C.int)(v) -} - -// GetOverlapFlagAddr gets `AVFilmGrainAOMParams.overlap_flag` address. -func (aomp *AVFilmGrainAOMParams) GetOverlapFlagAddr() *int32 { - return (*int32)(&aomp.overlap_flag) -} - -// GetLimitOutputRange gets `AVFilmGrainAOMParams.limit_outputrange` value. -func (aomp *AVFilmGrainAOMParams) GetLimitOutputRange() int32 { - return (int32)(aomp.limit_output_range) -} - -// SetLimitOutputRange sets `AVFilmGrainAOMParams.limit_outputrange` value. -func (aomp *AVFilmGrainAOMParams) SetLimitOutputRange(v int32) { - aomp.limit_output_range = (C.int)(v) -} - -// GetLimitOutputRangeAddr gets `AVFilmGrainAOMParams.limit_outputrange` address. -func (aomp *AVFilmGrainAOMParams) GetLimitOutputRangeAddr() *int32 { - return (*int32)(&aomp.limit_output_range) -} - -// AVFilmGrainParams -type AVFilmGrainParams C.struct_AVFilmGrainParams - -// GetType gets `AVFilmGrainParams.type` value. -func (fgp *AVFilmGrainParams) GetType() AVFilmGrainParamsType { - return (AVFilmGrainParamsType)(fgp._type) -} - -// SetType sets `AVFilmGrainParams.type` value. -func (fgp *AVFilmGrainParams) SetType(v AVFilmGrainParamsType) { - fgp._type = (C.enum_AVFilmGrainParamsType)(v) -} - -// GetTypeAddr gets `AVFilmGrainParams.type` address. -func (fgp *AVFilmGrainParams) GetTypeAddr() *AVFilmGrainParamsType { - return (*AVFilmGrainParamsType)(&fgp._type) -} - -// GetSeed gets `AVFilmGrainParams.seed` value. -func (fgp *AVFilmGrainParams) GetSeed() uint64 { - return (uint64)(fgp.seed) -} - -// SetSeed sets `AVFilmGrainParams.seed` value. -func (fgp *AVFilmGrainParams) SetSeed(v uint64) { - fgp.seed = (C.uint64_t)(v) -} - -// GetSeedAddr gets `AVFilmGrainParams.seed` address. -func (fgp *AVFilmGrainParams) GetSeedAddr() *uint64 { - return (*uint64)(&fgp.seed) -} - -// GetCodecAom gets `AVFilmGrainParams.codec_aom` value. -func (fgp *AVFilmGrainParams) GetCodecAom() AVFilmGrainAOMParams { - return (AVFilmGrainAOMParams)( - C.get_av_film_grain_params_codec_aom((*C.struct_AVFilmGrainParams)(fgp))) -} - -// SetCodecAom sets `AVFilmGrainParams.codec_aom` value. -func (fgp *AVFilmGrainParams) SetCodecAom(v AVFilmGrainAOMParams) { - C.set_av_film_grain_params_codec_aom((*C.struct_AVFilmGrainParams)(fgp), - (C.struct_AVFilmGrainAOMParams)(v)) -} - -// GetCodecAomAddr gets `AVFilmGrainParams.codec_aom` address. -func (fgp *AVFilmGrainParams) GetCodecAomAddr() *AVFilmGrainAOMParams { - return (*AVFilmGrainAOMParams)(C.get_av_film_grain_params_codec_aom_addr( - (*C.struct_AVFilmGrainParams)(fgp))) -} - -// AvFilmGrainParamsAlloc allocates an AVFilmGrainParams structure and set its fields to -// default values. -func AvFilmGrainParamsAlloc(size *uintptr) *AVFilmGrainParams { - return (*AVFilmGrainParams)(C.av_film_grain_params_alloc((*C.size_t)(unsafe.Pointer(size)))) -} - -// AvFilmGrainParamsCreateSideData allocates a complete AVFilmGrainParams and add it to the frame. -func AvFilmGrainParamsCreateSideData(frame *AVFrame) *AVFilmGrainParams { - return (*AVFilmGrainParams)(C.av_film_grain_params_create_side_data((*C.struct_AVFrame)(frame))) -} diff --git a/avutil_frame.go b/avutil_frame.go index 9d0d0a9..b8adbea 100644 --- a/avutil_frame.go +++ b/avutil_frame.go @@ -36,8 +36,6 @@ const ( AV_FRAME_DATA_DYNAMIC_HDR_PLUS = AVFrameSideDataType(C.AV_FRAME_DATA_DYNAMIC_HDR_PLUS) AV_FRAME_DATA_REGIONS_OF_INTEREST = AVFrameSideDataType(C.AV_FRAME_DATA_REGIONS_OF_INTEREST) AV_FRAME_DATA_VIDEO_ENC_PARAMS = AVFrameSideDataType(C.AV_FRAME_DATA_VIDEO_ENC_PARAMS) - AV_FRAME_DATA_SEI_UNREGISTERED = AVFrameSideDataType(C.AV_FRAME_DATA_SEI_UNREGISTERED) - AV_FRAME_DATA_FILM_GRAIN_PARAMS = AVFrameSideDataType(C.AV_FRAME_DATA_FILM_GRAIN_PARAMS) ) // AVActiveFormatDescription diff --git a/avutil_imgutils.go b/avutil_imgutils.go index 1db1824..ba1a64a 100644 --- a/avutil_imgutils.go +++ b/avutil_imgutils.go @@ -41,18 +41,6 @@ func AvImageFillLinesizes(linesizes []int32, pixFmt AVPixelFormat, width int32) (C.enum_AVPixelFormat)(pixFmt), (C.int)(width))) } -// AvImageFillPlaneSizes fills plane sizes for an image with pixel format pix_fmt and height height. -func AvImageFillPlaneSizes(size []uintptr, pixFmt AVPixelFormat, height int32, linesizes []int) int32 { - if len(size) < 4 { - panic("size len < 4") - } - if len(linesizes) < 4 { - panic("linesizes len < 4") - } - return (int32)(C.av_image_fill_plane_sizes((*C.size_t)(unsafe.Pointer(&size[0])), - (C.enum_AVPixelFormat)(pixFmt), (C.int)(height), (*C.ptrdiff_t)(unsafe.Pointer(&linesizes[0])))) -} - // AvImageFillPointers fills plane data pointers for an image with pixel format pix_fmt and height height. func AvImageFillPointers(data []*uint8, pixFmt AVPixelFormat, height int32, ptr *uint8, linesizes []int32) int32 { diff --git a/avutil_log.go b/avutil_log.go index 9060a60..4c506ad 100644 --- a/avutil_log.go +++ b/avutil_log.go @@ -132,22 +132,16 @@ func (cls *AVClass) GetChildNextAddr() *AvClassChildNextFunc { return (*AvClassChildNextFunc)(&cls.child_next) } -// Deprecated: No use. -// // GetChildClassNext gets `AVClass.child_class_next` value. func (cls *AVClass) GetChildClassNext() AvClassChildClassNextFunc { return (AvClassChildClassNextFunc)(cls.child_class_next) } -// Deprecated: No use. -// // SetChildClassNext sets `AVClass.child_class_next` value. func (cls *AVClass) SetChildClassNext(v AvClassChildClassNextFunc) { cls.child_class_next = (C.av_class_child_class_next_func)(v) } -// Deprecated: No use. -// // GetChildClassNextAddr gets `AVClass.child_class_next` address. func (cls *AVClass) GetChildClassNextAddr() *AvClassChildClassNextFunc { return (*AvClassChildClassNextFunc)(&cls.child_class_next) diff --git a/avutil_opt.go b/avutil_opt.go index 7b2fa1b..b924638 100644 --- a/avutil_opt.go +++ b/avutil_opt.go @@ -507,19 +507,12 @@ func AvOptChildNext(obj, prev CVoidPointer) unsafe.Pointer { return C.av_opt_child_next(VoidPointer(obj), VoidPointer(prev)) } -// Deprecated: Use AvOptChildClassIterate instead. -// // AvOptChildClassNext func AvOptChildClassNext(parent, prev *AVClass) *AVClass { return (*AVClass)(C.av_opt_child_class_next((*C.struct_AVClass)(parent), (*C.struct_AVClass)(prev))) } -// AvOptChildClassIterate iterates over potential AVOptions-enabled children of parent. -func AvOptChildClassIterate(parent *AVClass, iter CVoidPointerPointer) *AVClass { - return (*AVClass)(C.av_opt_child_class_iterate((*C.struct_AVClass)(parent), VoidPointerPointer(iter))) -} - // AvOptSet func AvOptSet(obj CVoidPointer, name string, val string, searchFlags int32) int32 { namePtr, nameFunc := StringCasting(name) diff --git a/avutil_pixfmt.go b/avutil_pixfmt.go index 1ebe779..dd4544f 100644 --- a/avutil_pixfmt.go +++ b/avutil_pixfmt.go @@ -257,9 +257,7 @@ const ( AV_PIX_FMT_Y210BE = AVPixelFormat(C.AV_PIX_FMT_Y210BE) AV_PIX_FMT_Y210LE = AVPixelFormat(C.AV_PIX_FMT_Y210LE) - AV_PIX_FMT_X2RGB10LE = AVPixelFormat(C.AV_PIX_FMT_X2RGB10LE) - AV_PIX_FMT_X2RGB10BE = AVPixelFormat(C.AV_PIX_FMT_X2RGB10BE) - AV_PIX_FMT_NB = AVPixelFormat(C.AV_PIX_FMT_NB) + AV_PIX_FMT_NB = AVPixelFormat(C.AV_PIX_FMT_NB) ) const ( @@ -342,8 +340,7 @@ const ( AV_PIX_FMT_P010 = AVPixelFormat(C.AV_PIX_FMT_P010) AV_PIX_FMT_P016 = AVPixelFormat(C.AV_PIX_FMT_P016) - AV_PIX_FMT_Y210 = AVPixelFormat(C.AV_PIX_FMT_Y210) - AV_PIX_FMT_X2RGB10 = AVPixelFormat(C.AV_PIX_FMT_X2RGB10) + AV_PIX_FMT_Y210 = AVPixelFormat(C.AV_PIX_FMT_Y210) ) // Chromaticity coordinates of the source primaries. diff --git a/avutil_timecode.go b/avutil_timecode.go index f66e764..c4e4e2b 100644 --- a/avutil_timecode.go +++ b/avutil_timecode.go @@ -93,12 +93,6 @@ func AvTimecodeGetSmpteFromFramenum(tc *AVTimecode, framenum int32) uint32 { return (uint32)(C.av_timecode_get_smpte_from_framenum((*C.AVTimecode)(tc), (C.int)(framenum))) } -// AvTimecodeGetSmpte converts sei info to SMPTE 12M binary representation. -func AvTimecodeGetSmpte(rate AVRational, drop, hh, mm, ss, ff int32) int32 { - return (int32)(C.av_timecode_get_smpte((C.struct_AVRational)(rate), - (C.int)(drop), (C.int)(hh), (C.int)(mm), (C.int)(ss), (C.int)(ff))) -} - // AvTimecodeMakeString loads timecode string in buf. func AvTimecodeMakeString(tc *AVTimecode, framenum int32) (buf, bufPar string) { b := make([]C.char, AV_TIMECODE_STR_SIZE+1) @@ -106,14 +100,6 @@ func AvTimecodeMakeString(tc *AVTimecode, framenum int32) (buf, bufPar string) { return C.GoString(&b[0]), C.GoString(ret) } -// AvTimecodeMakeSmpteTcString2 gets the timecode string from the SMPTE timecode format. -func AvTimecodeMakeSmpteTcString2(rate AVRational, tcsmpte uint32, preventDf, skipField int32) (buf, bufPar string) { - b := make([]C.char, AV_TIMECODE_STR_SIZE+1) - ret := C.av_timecode_make_smpte_tc_string2((*C.char)(&b[0]), - (C.AVRational)(rate), (C.uint32_t)(tcsmpte), (C.int)(preventDf), (C.int)(skipField)) - return C.GoString(&b[0]), C.GoString(ret) -} - // AvTimecodeMakeSmpteTcString gets the timecode string from the SMPTE timecode format. func AvTimecodeMakeSmpteTcString(tcsmpte uint32, preventDf int32) (buf, bufPar string) { b := make([]C.char, AV_TIMECODE_STR_SIZE+1) @@ -134,15 +120,6 @@ func AvTimecodeInit(tc *AVTimecode, rate AVRational, flags, frameStart int32, lo (C.int)(flags), (C.int)(frameStart), VoidPointer(logCtx))) } -// AvTimecodeInitFromComponents initializes a timecode struct from the passed timecode components. -func AvTimecodeInitFromComponents(tc *AVTimecode, rate AVRational, - flags, hh, mm, ss, ff int32, logCtx CVoidPointer) int32 { - return (int32)(C.av_timecode_init_from_components((*C.AVTimecode)(tc), - (C.struct_AVRational)(rate), (C.int)(flags), - (C.int)(hh), (C.int)(mm), (C.int)(ss), (C.int)(ff), - VoidPointer(logCtx))) -} - // AvTimecodeInitFromString parses timecode representation (hh:mm:ss[:;.]ff). func AvTimecodeInitFromString(tc *AVTimecode, rate AVRational, str string, logCtx CVoidPointer) int32 { strPtr, strFunc := StringCasting(str) diff --git a/avutil_tx.go b/avutil_tx.go index 4b96bf1..1c22e7a 100644 --- a/avutil_tx.go +++ b/avutil_tx.go @@ -148,13 +148,6 @@ const ( // typedef void (*av_tx_fn)(AVTXContext *s, void *out, void *in, ptrdiff_t stride); type AvTxFn = C.av_tx_fn -// AVTXFlags -type AVTXFlags = C.enum_AVTXFlags - -const ( - AV_TX_INPLACE = AVTXFlags(C.AV_TX_INPLACE) -) - // AvTxInit initializes a transform context with the given configuration // (i)MDCTs with an odd length are currently not supported. func AvTxInit(ctx **AVTXContext, tx *AvTxFn, _type AVTXType, diff --git a/avutil_video_enc_params.go b/avutil_video_enc_params.go index e479363..e3f255e 100644 --- a/avutil_video_enc_params.go +++ b/avutil_video_enc_params.go @@ -14,10 +14,9 @@ import "unsafe" type AVVideoEncParamsType = C.enum_AVVideoEncParamsType const ( - AV_VIDEO_ENC_PARAMS_NONE = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_NONE) - AV_VIDEO_ENC_PARAMS_VP9 = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_VP9) - AV_VIDEO_ENC_PARAMS_H264 = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_H264) - AV_VIDEO_ENC_PARAMS_MPEG2 = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_MPEG2) + AV_VIDEO_ENC_PARAMS_NONE = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_NONE) + AV_VIDEO_ENC_PARAMS_VP9 = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_VP9) + AV_VIDEO_ENC_PARAMS_H264 = AVVideoEncParamsType(C.AV_VIDEO_ENC_PARAMS_H264) ) // AVVideoEncParams