From 3b38cce9036b80f2ccbbd5a8f1b84bb65d5b63d3 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 28 Jul 2013 09:29:58 +0000 Subject: This is the first complete try of libavutil. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3004 b956fd51-792f-4845-bead-9b4dfca2ff2c --- .../ffmpeg-2.0/How to update the ffmpeg files.txt | 17 ++ src/lib/ffmpeg-2.0/ToDo.txt | 11 + src/lib/ffmpeg-2.0/avutil.pas | 324 +++++++++++++++++++++ src/lib/ffmpeg-2.0/libavutil/cpu.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/dict.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/error.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/log.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/mathematics.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/mem.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/opt.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/pixfmt.pas | 2 +- src/lib/ffmpeg-2.0/libavutil/samplefmt.pas | 2 +- src/lib/ffmpeg-2.0/rational.pas | 207 +++++++++++++ 13 files changed, 568 insertions(+), 9 deletions(-) create mode 100644 src/lib/ffmpeg-2.0/How to update the ffmpeg files.txt create mode 100644 src/lib/ffmpeg-2.0/ToDo.txt create mode 100644 src/lib/ffmpeg-2.0/avutil.pas create mode 100644 src/lib/ffmpeg-2.0/rational.pas (limited to 'src/lib/ffmpeg-2.0') diff --git a/src/lib/ffmpeg-2.0/How to update the ffmpeg files.txt b/src/lib/ffmpeg-2.0/How to update the ffmpeg files.txt new file mode 100644 index 00000000..7e376454 --- /dev/null +++ b/src/lib/ffmpeg-2.0/How to update the ffmpeg files.txt @@ -0,0 +1,17 @@ +how to update the ffmpeg files: + +1) cpu.pas + dict.pas + error.pas + log.pas + mathematics.pas + mem.pas + opt.pas + pixfmt.pas + samplefmt.pas +2) rational.pas +3) avutil.pas +4) avcodec.pas +5) avio.pas + swscale.pas +6) avformat.pas \ No newline at end of file diff --git a/src/lib/ffmpeg-2.0/ToDo.txt b/src/lib/ffmpeg-2.0/ToDo.txt new file mode 100644 index 00000000..44a1a058 --- /dev/null +++ b/src/lib/ffmpeg-2.0/ToDo.txt @@ -0,0 +1,11 @@ +1) avutil.pas + +from mem.pas: +inline function av_x_if_null +inline function av_size_mult + +from log.pas: +inline function av_log +inline function av_log_set_callback +inline function av_log_default_callback +inline function av_dlog diff --git a/src/lib/ffmpeg-2.0/avutil.pas b/src/lib/ffmpeg-2.0/avutil.pas new file mode 100644 index 00000000..4383797d --- /dev/null +++ b/src/lib/ffmpeg-2.0/avutil.pas @@ -0,0 +1,324 @@ +(* + * copyright (c) 2006 Michael Niedermayer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * This is a part of Pascal porting of ffmpeg. + * - Originally by Victor Zinetz for Delphi and Free Pascal on Windows. + * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT + * in the source codes. + * - Changes and updates by the UltraStar Deluxe Team + * + * Conversions of + * + * libavutil/avutil.h: + * version: 52.38.100 + * + *) + +unit avutil; + +{$IFDEF FPC} + {$MODE DELPHI} + {$PACKENUM 4} (* use 4-byte enums *) + {$PACKRECORDS C} (* C/C++-compatible record packing *) +{$ELSE} + {$MINENUMSIZE 4} (* use 4-byte enums *) +{$ENDIF} + +{$IFDEF DARWIN} + {$linklib libavutil} +{$ENDIF} + +interface + +uses + ctypes, + rational, + {$IFDEF UNIX} + BaseUnix, + {$ENDIF} + UConfig; + +const + (* Max. supported version by this header *) + LIBAVUTIL_MAX_VERSION_MAJOR = 52; + LIBAVUTIL_MAX_VERSION_MINOR = 38; + LIBAVUTIL_MAX_VERSION_RELEASE = 100; + LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) + + (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) + + (LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE); + + (* Min. supported version by this header *) + LIBAVUTIL_MIN_VERSION_MAJOR = 52; + LIBAVUTIL_MIN_VERSION_MINOR = 38; + LIBAVUTIL_MIN_VERSION_RELEASE = 0; + LIBAVUTIL_MIN_VERSION = (LIBAVUTIL_MIN_VERSION_MAJOR * VERSION_MAJOR) + + (LIBAVUTIL_MIN_VERSION_MINOR * VERSION_MINOR) + + (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} + +{$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)} + {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} +{$IFEND} + +type +{$IFNDEF FPC} + // defines for Delphi + size_t = cardinal; +{$ENDIF} + Psize_t = ^size_t; + +(** + * Return the LIBAVUTIL_VERSION_INT constant. + *) +function avutil_version(): cuint; + cdecl; external av__util; + +(** + * Return the libavutil build-time configuration. + *) +function avutil_configuration(): PAnsiChar; + cdecl; external av__util; + +(** + * Return the libavutil license. + *) +function avutil_license(): PAnsiChar; + cdecl; external av__util; + +(** + * @addtogroup lavu_media Media Type + * @brief Media Type + *) + +type + TAVMediaType = ( + AVMEDIA_TYPE_UNKNOWN = -1, ///< Usually treated as AVMEDIA_TYPE_DATA + AVMEDIA_TYPE_VIDEO, + AVMEDIA_TYPE_AUDIO, + AVMEDIA_TYPE_DATA, ///< Opaque data information usually continuous + AVMEDIA_TYPE_SUBTITLE, + AVMEDIA_TYPE_ATTACHMENT, ///< Opaque data information usually sparse + AVMEDIA_TYPE_NB + ); + +(** + * Return a string describing the media_type enum, NULL if media_type + * is unknown. + *) +function av_get_media_type_string(media_type: TAVMediaType): PAnsiChar; + cdecl; external av__util; + +const + FF_LAMBDA_SHIFT = 7; + FF_LAMBDA_SCALE = (1 shl FF_LAMBDA_SHIFT); + FF_QP2LAMBDA = 118; ///< factor to convert from H.263 QP to lambda + FF_LAMBDA_MAX = (256*128-1); + + FF_QUALITY_SCALE = FF_LAMBDA_SCALE; //FIXME maybe remove + +(** + * @brief Undefined timestamp value + * + * Usually reported by demuxer that work on containers that do not provide + * either pts or dts. + *) + + AV_NOPTS_VALUE = $8000000000000000; + +(** + * Internal time base represented as integer + *) + + AV_TIME_BASE = 1000000; + +(** + * Internal time base represented as fractional value + *) + + AV_TIME_BASE_Q : TAVRational = (num: 1; den: AV_TIME_BASE); + +(** + * @} + * @} + * @defgroup lavu_picture Image related + * + * AVPicture types, pixel formats and basic image planes manipulation. + * + * @{ + *) + +type + TAVPictureType = ( + AV_PICTURE_TYPE_NONE = 0, ///< Undefined + AV_PICTURE_TYPE_I, ///< Intra + AV_PICTURE_TYPE_P, ///< Predicted + AV_PICTURE_TYPE_B, ///< Bi-dir predicted + AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4 + AV_PICTURE_TYPE_SI, ///< Switching Intra + AV_PICTURE_TYPE_SP, ///< Switching Predicted + AV_PICTURE_TYPE_BI ///< BI type + ); + +(** + * Return a single letter to describe the given picture type + * pict_type. + * + * @param[in] pict_type the picture type @return a single character + * representing the picture type, '?' if pict_type is unknown + *) +function av_get_picture_type_char(pict_type: TAVPictureType): PAnsiChar; + cdecl; external av__util; + +(** + * Return x default pointer in case p is NULL. + *) +function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer; {$IFDEF HasInline}inline;{$ENDIF} + +(** + * Compute the length of an integer list. + * + * @param elsize size in bytes of each list element (only 1, 2, 4 or 8) + * @param term list terminator (usually 0 or -1) + * @param list pointer to the list + * @return length of the list, in elements, not counting the terminator + *) +function av_int_list_length_for_size(elsize: cuint; + {const} list: pointer; term: cuint64): cuint; {av_pure} + cdecl; external av__util; + +(** + * Compute the length of an integer list. + * + * @param term list terminator (usually 0 or -1) + * @param list pointer to the list + * @return length of the list, in elements, not counting the terminator + *) +function av_int_list_length({const} list: pointer; term: cuint64): cuint; + +{$INCLUDE libavutil/cpu.pas} + +{$INCLUDE libavutil/dict.pas} + +{$INCLUDE libavutil/error.pas} + +{$INCLUDE libavutil/mathematics.pas} + +{$INCLUDE libavutil/mem.pas} + +{$INCLUDE libavutil/opt.pas} + +{$INCLUDE libavutil/log.pas} + +{$INCLUDE libavutil/pixfmt.pas} + +{$INCLUDE libavutil/samplefmt.pas} + +(* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010 + +(** + * MKTAG and MKBETAG are usually used to convert a magic string to an enumeration index. + * In Pascal this can probably not be used and the functions could be removed. + * KMS 8/6/2012 + *) +function MKTAG (a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} +function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} + +implementation + +function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer; {$IFDEF HasInline}inline;{$ENDIF} +begin + if p = nil then + Result := x + else + Result := p; +end; + +function av_int_list_length({const} list: pointer; term: cuint64): cuint; +begin + // KMS 2013: It is not really clear whether it should be sizeof(pointer) or sizeof(cint). + // Going for the larger one (pointer) should at least prevent buffer overflows. + // So, the result is either 4 byte or 8 byte. + Result := av_int_list_length_for_size(sizeof(pointer), list, term); +end; + +(* libavutil/common.h *) + +function MKTAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} +begin + Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24)); +end; + +function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} +begin + Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24)); +end; + +(* libavutil/error.h *) + +function av_make_error_string(errbuf: Pchar; errbuf_size: size_t; errnum: cint): Pchar; {$IFDEF HasInline}inline;{$ENDIF} +begin + av_strerror(errnum, errbuf, errbuf_size); + av_make_error_string := errbuf; +end; + +function av_err2str(errnum: cint): pchar; {$IFDEF HasInline}inline;{$ENDIF} +var + errbuf: Pchar; +begin + errbuf := stralloc(AV_ERROR_MAX_STRING_SIZE); + av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum); +end; + +(* libavutil/mem.h *) + +function av_size_mult(a: size_t; b: size_t; r: Psize_t): size_t; + cdecl; external av__util; +(* To Be Implemented, March 2012 KMS *) +//function av_size_mult(a: size_t; b: size_t; r: pointer): size_t; +//begin +// { +// size_t t = a * b; +// /* Hack inspired from glibc: only try the division if nelem and elsize +// * are both greater than sqrt(SIZE_MAX). */ +// if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b) +// return AVERROR(EINVAL); +// *r = t; +// return 0; +//} +//end; + +function av_malloc_array(nmemb: size_t; size: size_t): pointer; {$IFDEF HasInline}inline;{$ENDIF} {av_alloc_size(1,2)} +begin + if (size <= 0 ) or (nmemb >= maxint / size) then + av_malloc_array := NIL + else + av_malloc_array := av_malloc(nmemb * size); +end; + +function av_mallocz_array(nmemb: size_t; size: size_t): pointer; {$IFDEF HasInline}inline;{$ENDIF} {av_alloc_size(1,2)} +begin + if (size <= 0 ) or (nmemb >= maxint / size) then + av_mallocz_array := NIL + else + av_mallocz_array := av_mallocz(nmemb * size); +end; + +end. diff --git a/src/lib/ffmpeg-2.0/libavutil/cpu.pas b/src/lib/ffmpeg-2.0/libavutil/cpu.pas index 4977131f..635b8928 100644 --- a/src/lib/ffmpeg-2.0/libavutil/cpu.pas +++ b/src/lib/ffmpeg-2.0/libavutil/cpu.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/cpu.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/dict.pas b/src/lib/ffmpeg-2.0/libavutil/dict.pas index 9838c9b6..21886657 100644 --- a/src/lib/ffmpeg-2.0/libavutil/dict.pas +++ b/src/lib/ffmpeg-2.0/libavutil/dict.pas @@ -19,7 +19,7 @@ * This is a part of the Pascal port of ffmpeg. * * Conversion of libavutil/dict.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/error.pas b/src/lib/ffmpeg-2.0/libavutil/error.pas index 46dbe51a..4406c2cd 100644 --- a/src/lib/ffmpeg-2.0/libavutil/error.pas +++ b/src/lib/ffmpeg-2.0/libavutil/error.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/error.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/log.pas b/src/lib/ffmpeg-2.0/libavutil/log.pas index 9cd709f8..73057a36 100644 --- a/src/lib/ffmpeg-2.0/libavutil/log.pas +++ b/src/lib/ffmpeg-2.0/libavutil/log.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/log.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/mathematics.pas b/src/lib/ffmpeg-2.0/libavutil/mathematics.pas index 7dcb5e1e..60c9e16c 100644 --- a/src/lib/ffmpeg-2.0/libavutil/mathematics.pas +++ b/src/lib/ffmpeg-2.0/libavutil/mathematics.pas @@ -22,7 +22,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/mathematics.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/mem.pas b/src/lib/ffmpeg-2.0/libavutil/mem.pas index ca1b8643..17c3461c 100644 --- a/src/lib/ffmpeg-2.0/libavutil/mem.pas +++ b/src/lib/ffmpeg-2.0/libavutil/mem.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/mem.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/opt.pas b/src/lib/ffmpeg-2.0/libavutil/opt.pas index fd865eea..983e923b 100644 --- a/src/lib/ffmpeg-2.0/libavutil/opt.pas +++ b/src/lib/ffmpeg-2.0/libavutil/opt.pas @@ -23,7 +23,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/opt.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/pixfmt.pas b/src/lib/ffmpeg-2.0/libavutil/pixfmt.pas index 1128de1e..c80e13d1 100644 --- a/src/lib/ffmpeg-2.0/libavutil/pixfmt.pas +++ b/src/lib/ffmpeg-2.0/libavutil/pixfmt.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/pixfmt.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/libavutil/samplefmt.pas b/src/lib/ffmpeg-2.0/libavutil/samplefmt.pas index 62241bc4..877d6207 100644 --- a/src/lib/ffmpeg-2.0/libavutil/samplefmt.pas +++ b/src/lib/ffmpeg-2.0/libavutil/samplefmt.pas @@ -19,7 +19,7 @@ * This is a part of the Pascal port of ffmpeg. * * Conversion of libavutil/samplefmt.h - * avutil version 52.13.100 + * avutil version 52.38.100 * *) diff --git a/src/lib/ffmpeg-2.0/rational.pas b/src/lib/ffmpeg-2.0/rational.pas new file mode 100644 index 00000000..54319362 --- /dev/null +++ b/src/lib/ffmpeg-2.0/rational.pas @@ -0,0 +1,207 @@ +(* + * rational numbers + * Copyright (c) 2003 Michael Niedermayer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * This is a part of Pascal porting of ffmpeg. + * - Originally by Victor Zinetz for Delphi and Free Pascal on Windows. + * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT + * in the source codes. + * - Changes and updates by the UltraStar Deluxe Team + * + * Conversion of libavutil/rational.h + * avutil version 52.38.100 + * + *) + +unit rational; + +{$IFDEF FPC} + {$MODE DELPHI} + {$PACKENUM 4} (* use 4-byte enums *) + {$PACKRECORDS C} (* C/C++-compatible record packing *) +{$ELSE} + {$MINENUMSIZE 4} (* use 4-byte enums *) +{$ENDIF} + +{$I switches.inc} + +interface + +uses + ctypes, + UConfig; + +(** + * @addtogroup lavu_math + * @{ + *) + +type +(** + * rational number numerator/denominator + *) + PAVRational = ^TAVRational; + TAVRational = record + num: cint; ///< numerator + den: cint; ///< denominator + end; + + TAVRationalArray = array[0 .. (MaxInt div SizeOf(TAVRational))-1] of TAVRational; + PAVRationalArray = ^TAVRationalArray; + +(** + * Compare two rationals. + * @param a first rational + * @param b second rational + * @return 0 if a==b, 1 if a>b, -1 if a 0) then + Result := (tmp shr 63) or 1 + else + Result := 0; +} +{ C original: + if(tmp) return ((tmp ^ a.den ^ b.den)>>63)|1; + else if(b.den && a.den) return 0; + else if(a.num && b.num) return (a.num>>31) - (b.num>>31); + else return INT_MIN; +} + + if tmp <> 0 then + Result := ((tmp xor a.den xor b.den) shr 63) or 1 + else if (b.den and a.den) <> 0 then + Result := 0 + else if (a.num and b.num) <> 0 then + Result := (a.num shr 31) - (b.num shr 31) + else + Result := low(cint); + +end; + +function av_q2d(a: TAVRational): cdouble; {$IFDEF HasInline}inline;{$ENDIF} +begin + Result := a.num / a.den; +end; + +function av_inv_q(q: TAVRational): TAVRational; {$IFDEF HasInline}inline;{$ENDIF} +begin + Result.num := q.den; + Result.den := q.num; +end; + +end. -- cgit v1.2.3