From 0f1c2f282869a7a2afaca53dd23fb440a8d25cec Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 27 Mar 2012 09:32:33 +0000 Subject: one round of debugging various issues. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2844 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg7/avcodec.pas | 107 +++++------ src/lib/ffmpeg7/avutil.pas | 430 +----------------------------------------- src/lib/ffmpeg7/samplefmt.pas | 10 +- 3 files changed, 66 insertions(+), 481 deletions(-) (limited to 'src') diff --git a/src/lib/ffmpeg7/avcodec.pas b/src/lib/ffmpeg7/avcodec.pas index 8c181c33..ad3eb10a 100644 --- a/src/lib/ffmpeg7/avcodec.pas +++ b/src/lib/ffmpeg7/avcodec.pas @@ -98,12 +98,12 @@ const (* Check if linked versions are supported *) {$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)} - {$MESSAGE Error 'Linked version of libavcodec is too old!'} +// {$MESSAGE Error 'Linked version of libavcodec is too old!'} {$IFEND} (* Check if linked version is supported *) {$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)} - {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'} +// {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'} {$IFEND} (** @@ -492,7 +492,7 @@ type CODEC_ID_CELT, //* subtitle codecs */ - CODEC_ID_DVD_SUBTITLE= 0x17000, + CODEC_ID_DVD_SUBTITLE= $17000, CODEC_ID_DVB_SUBTITLE, CODEC_ID_TEXT, ///< raw UTF-8 text CODEC_ID_XSUB, @@ -524,9 +524,8 @@ const CODEC_TYPE_SUBTITLE = AVMEDIA_TYPE_SUBTITLE; CODEC_TYPE_ATTACHMENT = AVMEDIA_TYPE_ATTACHMENT; CODEC_TYPE_NB = AVMEDIA_TYPE_NB; - ); -{$IFDEF FF_API_OLD_AUDIOCONVERT} +{$IF FF_API_OLD_AUDIOCONVERT} {$I audioconvert.pas} @@ -677,7 +676,7 @@ type AVCHROMA_LOC_NB ///< Not part of ABI ); -{$IFDEF FF_API_FLAC_GLOBAL_OPTS} +{$IF FF_API_FLAC_GLOBAL_OPTS} (** * LPC analysis type *) @@ -924,7 +923,7 @@ const FF_BUFFER_TYPE_SHARED = 4; ///< buffer from somewhere else, don't dealloc image (data/base), all other tables are not shared FF_BUFFER_TYPE_COPY = 8; ///< just a (modified) copy of some other buffer, don't dealloc anything. -{$IFDEF FF_API_OLD_FF_PICT_TYPES} +{$IF FF_API_OLD_FF_PICT_TYPES} (* DEPRECATED, directly use the AV_PICTURE_TYPE_* enum values *) FF_I_TYPE = 1; ///< Intra FF_P_TYPE = 2; ///< Predicted @@ -965,9 +964,9 @@ const FF_COMPLIANCE_VERY_STRICT = 2; ///< strictly conform to an older more strict version of the spec or reference software FF_COMPLIANCE_STRICT = 1; ///< strictly conform to all the things in the spec no matter what consequences FF_COMPLIANCE_NORMAL = 0; - {$IFDEF FF_API_INOFFICIAL} +{$IF FF_API_INOFFICIAL} FF_COMPLIANCE_INOFFICIAL = -1; ///< Allow inofficial extensions - {$IFEND} +{$IFEND} FF_COMPLIANCE_UNOFFICIAL = -1; ///< Allow unofficial extensions FF_COMPLIANCE_EXPERIMENTAL = -2; ///< Allow nonstandardized experimental things. @@ -1013,7 +1012,7 @@ const FF_EC_GUESS_MVS = 1; FF_EC_DEBLOCK = 2; -{$IFDEF FF_API_MM_FLAGS} +{$IF FF_API_MM_FLAGS} FF_MM_FORCE = AV_CPU_FLAG_FORCE; FF_MM_MMX = AV_CPU_FLAG_MMX; FF_MM_3DNOW = AV_CPU_FLAG_3DNOW; @@ -1030,7 +1029,7 @@ const FF_MM_SSE42 = AV_CPU_FLAG_SSE42; FF_MM_IWMMXT = AV_CPU_FLAG_IWMMXT; FF_MM_ALTIVEC = AV_CPU_FLAG_ALTIVEC; -{$ENDIF} +{$IFEND} FF_PRED_LEFT = 0; FF_PRED_PLANE = 1; @@ -1098,12 +1097,12 @@ const FF_MB_DECISION_BITS = 1; ///< chooses the one which needs the fewest bits FF_MB_DECISION_RD = 2; ///< rate distortion -{$IFDEF FF_API_ANTIALIAS_ALGO} +{$IF FF_API_ANTIALIAS_ALGO} FF_AA_AUTO = 0; FF_AA_FASTINT = 1; //not implemented yet FF_AA_INT = 2; FF_AA_FLOAT = 3; -{$ENDIF} +{$IFEND} FF_PROFILE_UNKNOWN = -99; FF_PROFILE_RESERVED = -100; @@ -1218,6 +1217,8 @@ const {$IFEND} type + PAVCodecContext = ^TAVCodecContext; + (** * Audio Video Frame. * New fields can be added to the end of FF_COMMON_FRAME with minor version @@ -1506,7 +1507,7 @@ type * - encoding: unused * - decoding: Read by user. *) - sample_aspect_ratio: AVRational; + sample_aspect_ratio: TAVRational; (** * width and height of the video frame @@ -1546,7 +1547,6 @@ type * version bump. * sizeof(AVCodecContext) must not be used outside libav*. *) - PAVCodecContext = ^TAVCodecContext; TAVCodecContext = record {720} (** * information on struct for av_log @@ -1644,7 +1644,7 @@ type *) pix_fmt: TAVPixelFormat; -{$IFDEF FF_API_RATE_EMU} +{$IF FF_API_RATE_EMU} (** * Frame rate emulation. If not zero, the lower layer (i.e. format handler) * has to read frames at native frame rate. @@ -1652,7 +1652,7 @@ type * - decoding: unused *) rate_emu: cint; -{$ENDIF} +{$IFEND} (** * If non NULL, 'draw_horiz_band' is called by the libavcodec @@ -1753,7 +1753,7 @@ type b_frame_strategy: cint; -{$IFDEF FF_API_HURRY_UP} +{$IF FF_API_HURRY_UP} (** * hurry up amount * - encoding: unused @@ -1761,7 +1761,7 @@ type * @deprecated Deprecated in favor of skip_idct and skip_frame. *) hurry_up: cint; -{$ENDIF} +{$IFEND} codec: PAVCodec; @@ -2141,7 +2141,7 @@ type *) error: array [0..3] of cuint64; -{$IFDEF FF_API_MB_Q} +{$IF FF_API_MB_Q} (** * minimum MB quantizer * - encoding: unused @@ -2155,7 +2155,7 @@ type * - decoding: unused *) mb_qmax: cint; {deprecated} -{$ENDIF} +{$IFEND} (** * motion estimation comparison function @@ -2385,14 +2385,14 @@ type *) lmax: cint; -{$IFDEF FF_API_PALETTE_CONTROL} +{$IF FF_API_PALETTE_CONTROL} (** * palette control structure * - encoding: ??? (no palette-enabled encoder yet) * - decoding: Set by user. *) palctrl: PAVPaletteControl; -{$ENDIF} +{$IFEND} (** * noise reduction strength @@ -2443,14 +2443,14 @@ type *) error_rate: cint; -{$IFDEF FF_API_ANTIALIAS_ALGO} +{$IF FF_API_ANTIALIAS_ALGO} (** * MP3 antialias algorithm, see FF_AA_* below. * - encoding: unused * - decoding: Set by user. *) antialias_algo: cint; {deprecated} -{$ENDIF} +{$IFEND} (** * quantizer noise shaping @@ -2772,7 +2772,7 @@ type *) compression_level: cint; -{$IFDEF FF_API_USE_LPC} +{$IF FF_API_USE_LPC} (** * Sets whether to use LPC mode - used by FLAC encoder. * - encoding: Set by user. @@ -2801,7 +2801,7 @@ type *) max_prediction_order: cint; -{$IFDEF FF_API_FLAC_GLOBAL_OPTS} +{$IF FF_API_FLAC_GLOBAL_OPTS} (** * search method for selecting prediction order * - encoding: Set by user. @@ -2829,7 +2829,7 @@ type *) timecode_frame_start: cint64; -{$IFDEF FF_API_REQUEST_CHANNELS} +{$IF FF_API_REQUEST_CHANNELS} (** * Decoder should decode to this many channels if it can (0 for default) * - encoding: unused @@ -3037,7 +3037,7 @@ type log_level_offset: cint; -{$IFDEF FF_API_FLAC_GLOBAL_OPTS} +{$IF FF_API_FLAC_GLOBAL_OPTS} (** * Determines which LPC analysis algorithm to use. * - encoding: Set by user @@ -3051,7 +3051,7 @@ type * - decoding: unused *) lpc_passes: cint; {deprecated} -{$ENDIF} +{$IFEND} (** * Number of slices. @@ -3156,6 +3156,7 @@ type (** * AVProfile. *) + PAVProfile = ^TAVProfile; TAVProfile = record profile: cint; name: {const} PAnsiChar; ///< short name for the profile @@ -3207,7 +3208,7 @@ type * If the codec allocates writable tables in init(), re-allocate them here. * priv_data will be set to a copy of the original. *) - init_thread_copy: function (avctx: PAVCodecContext): Pcint; + init_thread_copy: function (avctx: PAVCodecContext): Pcint; cdecl; (** * Copy necessary context variables from a previous thread context to the current one. * If not defined, the next thread will start automatically; otherwise, the codec @@ -3215,7 +3216,7 @@ type * * dst and src will (rarely) point to the same context, in which case memcpy should be skipped. *) - update_thread_context: function (dst: PAVCodecContext; src: {const} PAVCodecContext); + update_thread_context: function (dst: PAVCodecContext; src: {const} PAVCodecContext): cint; cdecl; (** @} *) end; {TAVCodec} @@ -3323,7 +3324,7 @@ type linesize: array [0..3] of cint; ///< number of bytes per line end; {TAVPicture} -{$IFDEF FF_API_PALETTE_CONTROL} +{$IF FF_API_PALETTE_CONTROL} (** * AVPaletteControl * This structure defines a method for communicating palette changes @@ -3344,7 +3345,7 @@ type * data is probably 6 bits in size and needs to be scaled *) palette: array [0..AVPALETTE_COUNT - 1] of cuint; end; {deprecated;} -{$ENDIF} +{$IFEND} TAVSubtitleType = ( SUBTITLE_NONE, @@ -3464,14 +3465,14 @@ type PAVResampleContext = pointer; PImgReSampleContext = pointer; -{$IFDEF FF_API_AUDIO_OLD} +{$IF FF_API_AUDIO_OLD} (** * @deprecated Use av_audio_resample_init() instead. *) function audio_resample_init (output_channels: cint; input_channels: cint; output_rate: cint; input_rate: cint): PReSampleContext; cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} (** * Initialize audio resampling context. @@ -3494,7 +3495,7 @@ function audio_resample_init (output_channels: cint; input_channels: cint; sample_fmt_out: TAVSampleFormat; sample_fmt_in: TAVSampleFormat; filter_length: cint; log2_phase_count: cint; - linear: cint; double cutoff: cdouble): PReSampleContext; + linear: cint; cutoff: cdouble): PReSampleContext; cdecl; external av__codec; function audio_resample (s: PReSampleContext; output: PSmallint; input: PSmallint; nb_samples: cint): cint; @@ -3634,7 +3635,7 @@ function avpicture_get_size (pix_fmt: TAVPixelFormat; width: cint; height: cint) procedure avcodec_get_chroma_sub_sample (pix_fmt: TAVPixelFormat; var h_shift: cint; var v_shift: cint); cdecl; external av__codec; -{$IFDEF FF_API_GET_PIX_FMT_NAME} +{$IF FF_API_GET_PIX_FMT_NAME} (** * Return the short name for a pixel format. * @@ -3643,7 +3644,7 @@ procedure avcodec_get_chroma_sub_sample (pix_fmt: TAVPixelFormat; var h_shift: c *) function avcodec_get_pix_fmt_name(pix_fmt: TAVPixelFormat): PAnsiChar; cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} procedure avcodec_set_dimensions(s: PAVCodecContext; width: cint; height: cint); cdecl; external av__codec; @@ -3738,7 +3739,7 @@ function avcodec_find_best_pix_fmt(pix_fmt_mask: cint64; src_pix_fmt: TAVPixelFo has_alpha: cint; loss_ptr: PCint): TAVPixelFormat; cdecl; external av__codec; -{$IFDEF LIBAVCODEC_VERSION_MAJOR < 53} +{$IF LIBAVCODEC_VERSION_MAJOR < 53} (** * @deprecated Use av_get_pix_fmt_string() instead. *) @@ -3814,14 +3815,14 @@ procedure avcodec_init(); *) procedure register_avcodec(codec: PAVCodec); cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} (** * Register the codec codec and initialize libavcodec. * * @see avcodec_init(), avcodec_register_all() *) -procedure register_avcodec(codec: PAVCodec); +procedure avcodec_register(codec: PAVCodec); cdecl; external av__codec; (** @@ -3995,7 +3996,7 @@ function avcodec_check_dimensions(av_log_ctx: pointer; w: cuint; h: cuint): cint function avcodec_default_get_format(s: PAVCodecContext; fmt: {const} PAVPixelFormat): TAVPixelFormat; cdecl; external av__codec; -{$IFDEF FF_API_THREAD_INIT} +{$IF FF_API_THREAD_INIT} (** * @deprecated Set s->thread_count before calling avcodec_open() instead of calling this. *) @@ -4003,7 +4004,7 @@ function avcodec_thread_init(s: PAVCodecContext; thread_count: cint): cint; cdecl; external av__codec; deprecated; procedure avcodec_thread_free(s: PAVCodecContext); cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} function avcodec_default_execute(s: PAVCodecContext; func: TExecuteFunc; arg: Pointer; var ret: cint; count: cint; size: cint): cint; cdecl; external av__codec; @@ -4043,7 +4044,7 @@ function avcodec_open(avctx: PAVCodecContext; codec: PAVCodec): cint; cdecl; external av__codec; -{$IFDEF FF_API_AUDIO_OLD} +{$IF FF_API_AUDIO_OLD} (** * Decode an audio frame from buf into samples. * Wrapper function which calls avcodec_decode_audio3. @@ -4110,7 +4111,7 @@ function avcodec_decode_audio3(avctx: PAVCodecContext; samples: PSmallint; avpkt: PAVPacket): cint; cdecl; external av__codec; -{$IFDEF FF_API_VIDEO_OLD} +{$IF FF_API_VIDEO_OLD} (** * Decode a video frame from buf into picture. * Wrapper function which calls avcodec_decode_video2. @@ -4135,7 +4136,7 @@ function avcodec_decode_video(avctx: PAVCodecContext; picture: PAVFrame; var got_picture_ptr: cint; buf: {const} PByteArray; buf_size: cint): cint; cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} (** * Decode the video frame of size avpkt->size from avpkt->data into picture. @@ -4172,7 +4173,7 @@ function avcodec_decode_video2(avctx: PAVCodecContext; picture: PAVFrame; avpkt: PAVPacket): cint; cdecl; external av__codec; -{$IFDEF FF_API_SUBTITLE_OLD} +{$IF FF_API_SUBTITLE_OLD} (* Decode a subtitle message. Return -1 if error, otherwise return the * number of bytes used. If no subtitle could be decompressed, * got_sub_ptr is zero. Otherwise, the subtitle is stored in*sub. @@ -4181,7 +4182,7 @@ function avcodec_decode_subtitle(avctx: PAVCodecContext; sub: PAVSubtitle; var got_sub_ptr: cint; buf: {const} PByteArray; buf_size: cint): cint; cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} (* Decode a subtitle message. * Return a negative value on error, otherwise return the number of bytes used. @@ -4286,7 +4287,7 @@ procedure avcodec_default_free_buffers(s: PAVCodecContext); (* misc useful functions *) -{$IFDEF FF_API_OLD_FF_PICT_TYPES} +{$IF FF_API_OLD_FF_PICT_TYPES} (** * Return a single letter to describe the given picture type pict_type. * @@ -4296,7 +4297,7 @@ procedure avcodec_default_free_buffers(s: PAVCodecContext); *) function av_get_pict_type_char(pict_type: cint): AnsiChar; cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} (** * Return codec bits per sample. @@ -4307,13 +4308,13 @@ function av_get_pict_type_char(pict_type: cint): AnsiChar; function av_get_bits_per_sample(codec_id: TCodecID): cint; cdecl; external av__codec; -{$IFDEF FF_API_OLD_SAMPLE_FMT} +{$IF FF_API_OLD_SAMPLE_FMT} (** * @deprecated Use av_get_bits_per_sample_fmt() instead. *) function av_get_bits_per_sample_format(sample_fmt: TAVSampleFormat): cint; cdecl; external av__codec; deprecated; -{$ENDIF} +{$IFEND} const AV_PARSER_PTS_NB = 4; diff --git a/src/lib/ffmpeg7/avutil.pas b/src/lib/ffmpeg7/avutil.pas index e2cfd496..1b66b2e5 100644 --- a/src/lib/ffmpeg7/avutil.pas +++ b/src/lib/ffmpeg7/avutil.pas @@ -26,13 +26,8 @@ * libavutil/avutil.h: * version: 50.43.0 * - * libavutil/mem.h: - * - * libavutil/log.h: - * * include/keep pixfmt.h (change in revision 50.01.0) * Maybe, the pixelformats are not needed, but it has not been checked. - * log.h is only partial. * *) @@ -80,6 +75,7 @@ const (LIBAVUTIL_MIN_VERSION_RELEASE * VERSION_RELEASE); (* Check if linked versions are supported *) +(* {$IF (LIBAVUTIL_VERSION < LIBAVUTIL_MIN_VERSION)} {$MESSAGE Error 'Linked version of libavutil is too old!'} {$IFEND} @@ -87,6 +83,7 @@ const {$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)} {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} {$IFEND} +*) (** * Return the LIBAVUTIL_VERSION_INT constant. @@ -159,433 +156,16 @@ function av_get_picture_type_char(pict_type: TAVPictureType): Pchar; {$INCLUDE error.pas} -(* libavutil/pixfmt.h version: 50.43.0 *) - -type -(** - * Pixel format. Notes: - * - * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little-endian CPU architectures and ARGB on - * big-endian CPUs. - * - * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized - * image data is stored in AVFrame.data[0]. The palette is transported in - * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is - * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is - * also endian-specific). Note also that the individual RGB palette - * components stored in AVFrame.data[1] should be in the range 0..255. - * This is important as many custom PAL8 video codecs that were designed - * to run on the IBM VGA graphics adapter use 6-bit palette components. - * - * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like - * for pal8. This palette is filled in automatically by the function - * allocating the picture. - * - * Note, make sure that all newly added big endian formats have pix_fmt&1==1 - * and that all newly added little endian formats have pix_fmt&1==0 - * this allows simpler detection of big vs little endian. - *) - - PAVPixelFormat = ^TAVPixelFormat; - TAVPixelFormat = ( - PIX_FMT_NONE= -1, - PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) - PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr - PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... - PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR... - PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) - PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples) - PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples) - PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) - PIX_FMT_GRAY8, ///< Y , 8bpp - PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb - PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb - PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette - PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range - PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range - PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range - PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing - PIX_FMT_XVMC_MPEG2_IDCT, - PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 - PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 - PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) - PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits - PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb) - PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb) - PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits - PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb) - PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V) - PIX_FMT_NV21, ///< as above, but U and V bytes are swapped - - PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB... - PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA... - PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR... - PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA... - - PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian - PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian - PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) - PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range - PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) - PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian - PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian - - PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian - PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian - PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0 - PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0 - - PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian - PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian - PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1 - PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1 - - PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers - PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers - PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - - PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer - - PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 - PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0 - PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1 - PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1 - PIX_FMT_GRAY8A, ///< 8bit gray, 8bit alpha - PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian - PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian - - //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus - //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored seperately - //is better - PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - - PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions - ); - -const - PIX_FMT_Y400A = PIX_FMT_GRAY8A; - -{$ifdef WORDS_BIGENDIAN} - PIX_FMT_RGB32 = PIX_FMT_ARGB; - PIX_FMT_RGB32_1 = PIX_FMT_RGBA; - PIX_FMT_BGR32 = PIX_FMT_ABGR; - PIX_FMT_BGR32_1 = PIX_FMT_BGRA; - - PIX_FMT_GRAY16 = PIX_FMT_GRAY16BE; - PIX_FMT_RGB48 = PIX_FMT_RGB48BE; - PIX_FMT_RGB565 = PIX_FMT_RGB565BE; - PIX_FMT_RGB555 = PIX_FMT_RGB555BE; - PIX_FMT_RGB444 = PIX_FMT_RGB444BE; - PIX_FMT_BGR48 = PIX_FMT_BGR48BE; - PIX_FMT_BGR565 = PIX_FMT_BGR565BE; - PIX_FMT_BGR555 = PIX_FMT_BGR555BE; - PIX_FMT_BGR444 = PIX_FMT_BGR444BE; - - PIX_FMT_YUV420P9 = PIX_FMT_YUV420P9BE; - PIX_FMT_YUV444P9 = PIX_FMT_YUV444P9BE; - PIX_FMT_YUV420P10 = PIX_FMT_YUV420P10BE; - PIX_FMT_YUV422P10 = PIX_FMT_YUV422P10BE; - PIX_FMT_YUV444P10 = PIX_FMT_YUV444P10BE; - PIX_FMT_YUV420P16 = PIX_FMT_YUV420P16BE; - PIX_FMT_YUV422P16 = PIX_FMT_YUV422P16BE; - PIX_FMT_YUV444P16 = PIX_FMT_YUV444P16BE; -{$else} - PIX_FMT_RGB32 = PIX_FMT_BGRA; - PIX_FMT_RGB32_1 = PIX_FMT_ABGR; - PIX_FMT_BGR32 = PIX_FMT_RGBA; - PIX_FMT_BGR32_1 = PIX_FMT_ARGB; - - PIX_FMT_GRAY16 = PIX_FMT_GRAY16LE; - PIX_FMT_RGB48 = PIX_FMT_RGB48LE; - PIX_FMT_RGB565 = PIX_FMT_RGB565LE; - PIX_FMT_RGB555 = PIX_FMT_RGB555LE; - PIX_FMT_RGB444 = PIX_FMT_RGB444LE; - PIX_FMT_BGR48 = PIX_FMT_BGR48LE; - PIX_FMT_BGR565 = PIX_FMT_BGR565LE; - PIX_FMT_BGR555 = PIX_FMT_BGR555LE; - PIX_FMT_BGR444 = PIX_FMT_BGR444LE; - - PIX_FMT_YUV420P9 = PIX_FMT_YUV420P9LE; - PIX_FMT_YUV444P9 = PIX_FMT_YUV444P9LE; - PIX_FMT_YUV420P10 = PIX_FMT_YUV420P10LE; - PIX_FMT_YUV422P10 = PIX_FMT_YUV422P10LE; - PIX_FMT_YUV444P10 = PIX_FMT_YUV444P10LE; - PIX_FMT_YUV420P16 = PIX_FMT_YUV420P16LE; - PIX_FMT_YUV422P16 = PIX_FMT_YUV422P16LE; - PIX_FMT_YUV444P16 = PIX_FMT_YUV444P16LE; -{$ENDIF} +{$INCLUDE pixfmt.pas} (* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010 function MKTAG (a, b, c, d: AnsiChar): integer; function MKBETAG(a, b, c, d: AnsiChar): integer; -(* libavutil/mem.h *) - -(* memory handling functions *) - -type - FF_INTERNAL_MEM_TYPE = cuint; - -(** - * Allocate a block of size bytes with alignment suitable for all - * memory accesses (including vectors if available on the CPU). - * @param size Size in bytes for the memory block to be allocated. - * @return Pointer to the allocated block, NULL if the block cannot - * be allocated. - * @see av_mallocz() - *) -function av_malloc(size: FF_INTERNAL_MEM_TYPE): pointer; - cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)} - -(** - * Allocate or reallocate a block of memory. - * If ptr is NULL and size > 0, allocate a new block. If - * size is zero, free the memory block pointed to by ptr. - * @param size Size in bytes for the memory block to be allocated or - * reallocated. - * @param ptr Pointer to a memory block already allocated with - * av_malloc(z)() or av_realloc() or NULL. - * @return Pointer to a newly reallocated block or NULL if the block - * cannot be allocated or the function is used to free the memory block. - * @see av_fast_realloc() - *) -function av_realloc(ptr: pointer; size: FF_INTERNAL_MEM_TYPE): pointer; - cdecl; external av__util; {av_alloc_size(2)} +{$INCLUDE mem.pas} -(** - * Free a memory block which has been allocated with av_malloc(z)() or - * av_realloc(). - * @param ptr Pointer to the memory block which should be freed. - * @note ptr = NULL is explicitly allowed. - * @note It is recommended that you use av_freep() instead. - * @see av_freep() - *) -procedure av_free(ptr: pointer); - cdecl; external av__util; - -(** - * Allocate a block of size bytes with alignment suitable for all - * memory accesses (including vectors if available on the CPU) and - * zeroes all the bytes of the block. - * @param size Size in bytes for the memory block to be allocated. - * @return Pointer to the allocated block, NULL if it cannot be allocated. - * @see av_malloc() - *) -function av_mallocz(size: FF_INTERNAL_MEM_TYPE): pointer; - cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)} - -(** - * Duplicate the string s. - * @param s string to be duplicated. - * @return Pointer to a newly allocated string containing a - * copy of s or NULL if the string cannot be allocated. - *) -function av_strdup({const} s: PAnsiChar): PAnsiChar; - cdecl; external av__util; {av_malloc_attrib} - -(** - * Free a memory block which has been allocated with av_malloc(z)() or - * av_realloc() and set the pointer pointing to it to NULL. - * @param ptr Pointer to the pointer to the memory block which should - * be freed. - * @see av_free() - *) -procedure av_freep (ptr: pointer); - cdecl; external av__util; - -(** - * Add an element to a dynamic array. - * - * @param tab_ptr Pointer to the array. - * @param nb_ptr Pointer to the number of elements in the array. - * @param elem Element to be added. - *) -procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer); - cdecl; external av__util; - -(* libavutil/log.h *) - -type -(** - * Describe the class of an AVClass context structure. That is an - * arbitrary struct of which the first field is a pointer to an - * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.). - *) - PAVClass = ^TAVClass; - TAVClass = record - (** - * The name of the class; usually it is the same name as the - * context structure type to which the AVClass is associated. - *) - class_name: PAnsiChar; - - (** - * A pointer to a function which returns the name of a context - * instance ctx associated with the class. - *) - item_name: function(): PAnsiChar; cdecl; - - (** - * a pointer to the first option specified in the class if any or NULL - * - * @see av_set_default_options() - *) - option: PAVOption; - - (** - * LIBAVUTIL_VERSION with which this structure was created. - * This is used to allow fields to be added without requiring major - * version bumps everywhere. - *) - version: cint; - - (** - * Offset in the structure where log_level_offset is stored. - * 0 means there is no such variable - *) - log_level_offset_offset: cint; - - (** - * Offset in the structure where a pointer to the parent context for loging is stored. - * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such - * parent context. And a av_log() implementation could then display the parent context - * can be NULL of course - *) - parent_log_context_offset: cint; - - (** - * A function for extended searching, e.g. in possible - * children objects. - *) - opt_find: function(): PAVOption; cdecl; - end; - - -const - AV_LOG_QUIET = -8; - -(** - * Something went really wrong and we will crash now. - *) - AV_LOG_PANIC = 0; - -(** - * Something went wrong and recovery is not possible. - * For example, no header was found for a format which depends - * on headers or an illegal combination of parameters is used. - *) - AV_LOG_FATAL = 8; - -(** - * Something went wrong and cannot losslessly be recovered. - * However, not all future data is affected. - *) - AV_LOG_ERROR = 16; - -(** - * Something somehow does not look correct. This may or may not - * lead to problems. An example would be the use of '-vstrict -2'. - *) - AV_LOG_WARNING = 24; - - AV_LOG_INFO = 32; - AV_LOG_VERBOSE = 40; - -(** - * Stuff which is only useful for libav* developers. - *) - AV_LOG_DEBUG = 48; - -(** - * Send the specified message to the log if the level is less than or equal - * to the current av_log_level. By default, all logging messages are sent to - * stderr. This behavior can be altered by setting a different av_vlog callback - * function. - * - * @param avcl A pointer to an arbitrary struct of which the first field is a - * pointer to an AVClass struct. - * @param level The importance level of the message, lower values signifying - * higher importance. - * @param fmt The format string (printf-compatible) that specifies how - * subsequent arguments are converted to output. - * @see av_vlog - *) - -{** to be translated if needed -#ifdef __GNUC__ -void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4))); -#else -void av_log(void*, int level, const char *fmt, ...); -#endif -**} - -type - va_list = pointer; - -procedure av_vlog(avcl: pointer; level: cint; fmt: {const} PAnsiChar; dummy: va_list); - cdecl; external av__util; -function av_log_get_level(): cint; - cdecl; external av__util; -procedure av_log_set_level(level: cint); - cdecl; external av__util; - -{** to be translated if needed -void av_log_set_callback(void (*)(void*, int, const char*, va_list)); -void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl); -**} - -function av_default_item_name (ctx: pointer): PAnsiChar; - cdecl; external av__util; - -(** - * av_dlog macros - * Useful to print debug messages that shouldn't get compiled in normally. - *) -(** to be translated if needed -#ifdef DEBUG -# define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__) -#else -# define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) -#endif -**) - -(** - * Skip repeated messages, this requires the user app to use av_log() instead of - * (f)printf as the 2 would otherwise interfere and lead to - * "Last message repeated x times" messages below (f)printf messages with some - * bad luck. - * Also to receive the last, "last repeated" line if any, the user app must - * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end - *) -const - AV_LOG_SKIP_REPEATED = 1; -procedure av_log_set_flags(arg: cint); - cdecl; external av__util; +{$INCLUDE log.pas} implementation diff --git a/src/lib/ffmpeg7/samplefmt.pas b/src/lib/ffmpeg7/samplefmt.pas index 8b0c7c15..d4ddec5d 100644 --- a/src/lib/ffmpeg7/samplefmt.pas +++ b/src/lib/ffmpeg7/samplefmt.pas @@ -88,7 +88,7 @@ function av_get_sample_fmt(name: {const} PAnsiChar): TAVSampleFormat; function av_get_sample_fmt_string(buf: PAnsiChar; buf_size: cint; sample_fmt: TAVSampleFormat): PAnsiChar; cdecl; external av__util; -{$IF FF_API_GET_BITS_PER_SAMPLE_FMT} +{$IFDEF FF_API_GET_BITS_PER_SAMPLE_FMT} (** * @deprecated Use av_get_bytes_per_sample() instead. *) @@ -106,6 +106,10 @@ function av_get_bits_per_sample_fmt(sample_fmt: TAVSampleFormat): cint; deprecat function av_get_bytes_per_sample(sample_fmt: TAVSampleFormat): cint; cdecl; external av__util; +type + OctArrayOfPcuint8 = array[0..7] of Pcuint8; + OctArrayOfcint = array[0..7] of cint; + (** * Fill channel data pointers and linesizes for samples with sample * format sample_fmt. @@ -128,7 +132,7 @@ function av_get_bytes_per_sample(sample_fmt: TAVSampleFormat): cint; * @return the total size of the buffer, a negative * error code in case of failure *) -function av_samples_fill_arrays(pointers: array[0..7] of Pcuint8; linesizes: array[0..7] of cint; +function av_samples_fill_arrays(pointers: OctArrayOfPcuint8; linesizes: OctArrayOfcint; buf: Pcuint8; nb_channels: cint; nb_samples: cint; sample_fmt: TAVSampleFormat; planar: cint; align: cint): cint; cdecl; external av__util; @@ -147,7 +151,7 @@ function av_samples_fill_arrays(pointers: array[0..7] of Pcuint8; linesizes: arr * error code in case of failure * @see av_samples_fill_arrays() *) -function av_samples_alloc(pointers: array[0..7] of Pcuint8; linesizes: array[0..7] of cint; +function av_samples_alloc(pointers: OctArrayOfPcuint8; linesizes: OctArrayOfcint; nb_channels: cint; nb_samples: cint; sample_fmt: TAVSampleFormat; planar: cint; align: cint): cint; -- cgit v1.2.3