April 2012 - ffmpeg-cvslog - lists.ffmpeg.org

mkv: forward EMBL block data error
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sun Apr 29 17:39:31 2012 -0700| [721af294d9b7ba5df9ffe52b83254654c3d55f16] | committer: Luca Barbato mkv: forward EMBL block data error Do not return 0 on error. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=721af294d9b7ba5df… --- libavformat/matroskadec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e45cfb0..5688658 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1717,7 +1717,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, if ((n = matroska_ebmlnum_uint(matroska, data, size, &num)) < 0) { av_log(matroska->ctx, AV_LOG_ERROR, "EBML block data error\n"); - return res; + return n; } data += n; size -= n;

1 0

avcodec: introduce YCoCg colorspace
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Apr 29 13:35:51 2012 -0700| [85395ba73f9cc1b3cece3e85ae12f491ad7c1dd2] | committer: Luca Barbato avcodec: introduce YCoCg colorspace Non perceptual color model that aims to have an increase effectiveness in compression like the normal YCbCr while having near-lossless/lossless mapping to RGB. Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85395ba73f9cc1b3c… --- libavcodec/avcodec.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a3772a4..63857d0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -500,6 +500,7 @@ enum AVColorSpace{ AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above AVCOL_SPC_SMPTE240M = 7, + AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 AVCOL_SPC_NB , ///< Not part of ABI };

1 0

avcodec: cosmetic cleanup on header
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sun Apr 29 13:28:41 2012 -0700| [ccc2dfbcdf77c7186084eb04056b1e508aeb6789] | committer: Luca Barbato avcodec: cosmetic cleanup on header Apply coding style to the structs. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccc2dfbcdf77c7186… --- libavcodec/avcodec.h | 78 +++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0fda1cb..a3772a4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -465,49 +465,49 @@ enum Motion_Est_ID { enum AVDiscard{ /* We leave some space between them for extensions (drop some * keyframes for intra-only or drop just some bidir frames). */ - AVDISCARD_NONE =-16, ///< discard nothing - AVDISCARD_DEFAULT= 0, ///< discard useless packets like 0 size packets in avi - AVDISCARD_NONREF = 8, ///< discard all non reference - AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames - AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes - AVDISCARD_ALL = 48, ///< discard all + AVDISCARD_NONE =-16, ///< discard nothing + AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi + AVDISCARD_NONREF = 8, ///< discard all non reference + AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames + AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes + AVDISCARD_ALL = 48, ///< discard all }; enum AVColorPrimaries{ - AVCOL_PRI_BT709 =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B - AVCOL_PRI_UNSPECIFIED=2, - AVCOL_PRI_BT470M =4, - AVCOL_PRI_BT470BG =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM - AVCOL_PRI_SMPTE170M =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC - AVCOL_PRI_SMPTE240M =7, ///< functionally identical to above - AVCOL_PRI_FILM =8, - AVCOL_PRI_NB , ///< Not part of ABI + AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B + AVCOL_PRI_UNSPECIFIED = 2, + AVCOL_PRI_BT470M = 4, + AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM + AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC + AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above + AVCOL_PRI_FILM = 8, + AVCOL_PRI_NB , ///< Not part of ABI }; enum AVColorTransferCharacteristic{ - AVCOL_TRC_BT709 =1, ///< also ITU-R BT1361 - AVCOL_TRC_UNSPECIFIED=2, - AVCOL_TRC_GAMMA22 =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM - AVCOL_TRC_GAMMA28 =5, ///< also ITU-R BT470BG - AVCOL_TRC_NB , ///< Not part of ABI + AVCOL_TRC_BT709 = 1, ///< also ITU-R BT1361 + AVCOL_TRC_UNSPECIFIED = 2, + AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM + AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG + AVCOL_TRC_NB , ///< Not part of ABI }; enum AVColorSpace{ - AVCOL_SPC_RGB =0, - AVCOL_SPC_BT709 =1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B - AVCOL_SPC_UNSPECIFIED=2, - AVCOL_SPC_FCC =4, - AVCOL_SPC_BT470BG =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 - AVCOL_SPC_SMPTE170M =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above - AVCOL_SPC_SMPTE240M =7, - AVCOL_SPC_NB , ///< Not part of ABI + AVCOL_SPC_RGB = 0, + AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B + AVCOL_SPC_UNSPECIFIED = 2, + AVCOL_SPC_FCC = 4, + AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 + AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above + AVCOL_SPC_SMPTE240M = 7, + AVCOL_SPC_NB , ///< Not part of ABI }; enum AVColorRange{ - AVCOL_RANGE_UNSPECIFIED=0, - AVCOL_RANGE_MPEG =1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges - AVCOL_RANGE_JPEG =2, ///< the normal 2^n-1 "JPEG" YUV ranges - AVCOL_RANGE_NB , ///< Not part of ABI + AVCOL_RANGE_UNSPECIFIED = 0, + AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges + AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges + AVCOL_RANGE_NB , ///< Not part of ABI }; /** @@ -516,14 +516,14 @@ enum AVColorRange{ * X X 5 6 X 0 is undefined/unknown position */ enum AVChromaLocation{ - AVCHROMA_LOC_UNSPECIFIED=0, - AVCHROMA_LOC_LEFT =1, ///< mpeg2/4, h264 default - AVCHROMA_LOC_CENTER =2, ///< mpeg1, jpeg, h263 - AVCHROMA_LOC_TOPLEFT =3, ///< DV - AVCHROMA_LOC_TOP =4, - AVCHROMA_LOC_BOTTOMLEFT =5, - AVCHROMA_LOC_BOTTOM =6, - AVCHROMA_LOC_NB , ///< Not part of ABI + AVCHROMA_LOC_UNSPECIFIED = 0, + AVCHROMA_LOC_LEFT = 1, ///< mpeg2/4, h264 default + AVCHROMA_LOC_CENTER = 2, ///< mpeg1, jpeg, h263 + AVCHROMA_LOC_TOPLEFT = 3, ///< DV + AVCHROMA_LOC_TOP = 4, + AVCHROMA_LOC_BOTTOMLEFT = 5, + AVCHROMA_LOC_BOTTOM = 6, + AVCHROMA_LOC_NB , ///< Not part of ABI }; enum AVAudioServiceType {

1 0

aac sbr: align struct member by 32 byte.
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Sun Apr 29 16:41:23 2012 +0000| [b12bf032758fed28fe1aeffa242e64189389d204] | committer: Derek Buitenhuis aac sbr: align struct member by 32 byte. Required because it's used in a call to imdct_half(), which is an AVX function. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b12bf032758fed28f… --- libavcodec/sbr.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h index 459ee9c..23534b1 100644 --- a/libavcodec/sbr.h +++ b/libavcodec/sbr.h @@ -180,7 +180,7 @@ typedef struct { ///Sinusoidal levels float s_m[7][48]; float gain[7][48]; - DECLARE_ALIGNED(16, float, qmf_filter_scratch)[5][64]; + DECLARE_ALIGNED(32, float, qmf_filter_scratch)[5][64]; FFTContext mdct_ana; FFTContext mdct; SBRDSPContext dsp;

1 0

Exposing forced flag for DVD and PGS subtitles
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | hakuya <erikmiranda(a)gmail.com> | Sun Apr 15 21:58:40 2012 -0400| [79e5902cf163dcb8b6539618936ff0ce28f742e4] | committer: Michael Niedermayer Exposing forced flag for DVD and PGS subtitles Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79e5902cf163dcb8b… --- libavcodec/avcodec.h | 6 ++++++ libavcodec/dvdsubdec.c | 1 + libavcodec/options.c | 1 + libavcodec/pgssubdec.c | 3 +++ 4 files changed, 11 insertions(+), 0 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f8700dd..657e5b7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3158,6 +3158,12 @@ typedef struct AVSubtitleRect { * struct. */ char *ass; + + /** + * 1 indicates this subtitle is a forced subtitle. + * A forced subtitle should be displayed even when subtitles are hidden. + */ + int forced; } AVSubtitleRect; typedef struct AVSubtitle { diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 08d1db9..ec86b25 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -356,6 +356,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, sub_header->rects[0]->h = h; sub_header->rects[0]->type = SUBTITLE_BITMAP; sub_header->rects[0]->pict.linesize[0] = w; + sub_header->rects[0]->forced = is_menu; } } if (next_cmd_pos < cmd_pos) { diff --git a/libavcodec/options.c b/libavcodec/options.c index f4daf14..a08b7e5 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -264,6 +264,7 @@ static const AVOption subtitle_rect_options[]={ {"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, {"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, {"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, +{"forced", "", SROFFSET(forced), AV_OPT_TYPE_INT, {.dbl = 0}, 0, 1, 0}, {NULL}, }; diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index be0981d..4fb1e7d 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -423,6 +423,9 @@ static int display_end_segment(AVCodecContext *avctx, void *data, sub->rects[rect]->nb_colors = 256; sub->rects[rect]->pict.data[1] = av_mallocz(AVPALETTE_SIZE); + /* Copy the forced flag */ + sub->rects[rect]->forced = (ctx->presentation.objects[rect].composition & 0x40) != 0; + if (!ctx->forced_subs_only || ctx->presentation.objects[rect].composition & 0x40) memcpy(sub->rects[rect]->pict.data[1], ctx->clut, sub->rects[rect]->nb_colors * sizeof(uint32_t)); }

1 0

Added AVClass for AVSubtitleRect
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | hakuya <erikmiranda(a)gmail.com> | Wed Apr 18 02:08:25 2012 -0400| [1f46b50a9591f68b697e943f829c79a4f4829dd6] | committer: Michael Niedermayer Added AVClass for AVSubtitleRect Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f46b50a9591f68b6… --- libavcodec/avcodec.h | 8 ++++++++ libavcodec/options.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ba51ec1..f8700dd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3292,6 +3292,14 @@ const AVClass *avcodec_get_class(void); const AVClass *avcodec_get_frame_class(void); /** + * Get the AVClass for AVSubtitleRect. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +const AVClass *avcodec_get_subtitle_rect_class(void); + +/** * Copy the settings of the source AVCodecContext into the destination * AVCodecContext. The resulting destination codec context will be * unopened, i.e. you are required to call avcodec_open2() before you diff --git a/libavcodec/options.c b/libavcodec/options.c index 3731b1f..f4daf14 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -255,3 +255,26 @@ const AVClass *avcodec_get_frame_class(void) { return &av_frame_class; } + +#define SROFFSET(x) offsetof(AVSubtitleRect,x) + +static const AVOption subtitle_rect_options[]={ +{"x", "", SROFFSET(x), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, +{"y", "", SROFFSET(y), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, +{"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, +{"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, +{"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, 0}, +{NULL}, +}; + +static const AVClass av_subtitle_rect_class = { + .class_name = "AVSubtitleRect", + .item_name = NULL, + .option = subtitle_rect_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVClass *avcodec_get_subtitle_rect_class(void) +{ + return &av_subtitle_rect_class; +}

1 0

libavutil: Document the shortcommings of av_parse_cpu_flags()
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Apr 26 23:22:53 2012 +0200| [5e1286a72f50deb3f9edac0785868e1aee86c53e] | committer: Michael Niedermayer libavutil: Document the shortcommings of av_parse_cpu_flags() and suggest that av_parse_cpu_caps() be used. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e1286a72f50deb3f… --- libavutil/cpu.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavutil/cpu.h b/libavutil/cpu.h index a72b008..dec0566 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -75,6 +75,10 @@ attribute_deprecated void av_set_cpu_flags_mask(int mask); /** * Parse CPU flags from a string. * + * The returned flags contain the specified flags as well as related unspecified flags. + * + * This function exists only for compatibility with libav. + * Please use av_parse_cpu_caps() when possible. * @return a combination of AV_CPU_* flags, negative on error. */ int av_parse_cpu_flags(const char *s);

1 0

ffv1: 10l add forgotten avclass
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Apr 30 17:55:36 2012 +0200| [fd6eba428e609baee53a56fede4b6f777315d6e0] | committer: Michael Niedermayer ffv1: 10l add forgotten avclass Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd6eba428e609baee… --- libavcodec/ffv1.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 05d1d53..1f79c29 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -165,6 +165,7 @@ typedef struct PlaneContext{ #define MAX_SLICES 256 typedef struct FFV1Context{ + AVClass *class; AVCodecContext *avctx; RangeCoder c; GetBitContext gb;

1 0

cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps()
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Apr 26 23:21:43 2012 +0200| [eadac34c80cf4c58279b8fdfa9b6332683804da7] | committer: Michael Niedermayer cmdutils/avutil: Move cpu caps parse code into av_parse_cpu_caps() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eadac34c80cf4c582… --- cmdutils.c | 40 ++-------------------------------------- libavutil/avutil.h | 2 +- libavutil/cpu.c | 43 +++++++++++++++++++++++++++++++++++++++++++ libavutil/cpu.h | 7 +++++++ 4 files changed, 53 insertions(+), 39 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index d2c09e9..3d5c5f2 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -547,46 +547,10 @@ int opt_max_alloc(const char *opt, const char *arg) int opt_cpuflags(const char *opt, const char *arg) { - static const AVOption cpuflags_opts[] = { - { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, - { "altivec" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ALTIVEC }, .unit = "flags" }, - { "mmx" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_MMX }, .unit = "flags" }, - { "mmx2" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_MMX2 }, .unit = "flags" }, - { "sse" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE }, .unit = "flags" }, - { "sse2" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE2 }, .unit = "flags" }, - { "sse2slow", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE2SLOW }, .unit = "flags" }, - { "sse3" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE3 }, .unit = "flags" }, - { "sse3slow", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE3SLOW }, .unit = "flags" }, - { "ssse3" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSSE3 }, .unit = "flags" }, - { "atom" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ATOM }, .unit = "flags" }, - { "sse4.1" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE4 }, .unit = "flags" }, - { "sse4.2" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE42 }, .unit = "flags" }, - { "avx" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_AVX }, .unit = "flags" }, - { "xop" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_XOP }, .unit = "flags" }, - { "fma4" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_FMA4 }, .unit = "flags" }, - { "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOW }, .unit = "flags" }, - { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOWEXT }, .unit = "flags" }, - - { "armv5te", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV5TE }, .unit = "flags" }, - { "armv6", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6 }, .unit = "flags" }, - { "armv6t2", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6T2 }, .unit = "flags" }, - { "vfp", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFP }, .unit = "flags" }, - { "vfpv3", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFPV3 }, .unit = "flags" }, - { "neon", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_NEON }, .unit = "flags" }, - - { NULL }, - }; - static const AVClass class = { - .class_name = "cpuflags", - .item_name = av_default_item_name, - .option = cpuflags_opts, - .version = LIBAVUTIL_VERSION_INT, - }; - int flags = av_get_cpu_flags(); int ret; - const AVClass *pclass = &class; + unsigned flags = av_get_cpu_flags(); - if ((ret = av_opt_eval_flags(&pclass, &cpuflags_opts[0], arg, &flags)) < 0) + if ((ret = av_parse_cpu_caps(&flags, arg)) < 0) return ret; av_force_cpu_flags(flags); diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 1a9139e..04b0277 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -153,7 +153,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 48 +#define LIBAVUTIL_VERSION_MINOR 49 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 5fa83b3..b911880 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -110,6 +110,49 @@ int av_parse_cpu_flags(const char *s) return flags & INT_MAX; } +int av_parse_cpu_caps(unsigned *flags, const char *s) +{ + static const AVOption cpuflags_opts[] = { + { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, +#if ARCH_PPC + { "altivec" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ALTIVEC }, .unit = "flags" }, +#elif ARCH_X86 + { "mmx" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_MMX }, .unit = "flags" }, + { "mmx2" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_MMX2 }, .unit = "flags" }, + { "sse" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE }, .unit = "flags" }, + { "sse2" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE2 }, .unit = "flags" }, + { "sse2slow", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE2SLOW }, .unit = "flags" }, + { "sse3" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE3 }, .unit = "flags" }, + { "sse3slow", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE3SLOW }, .unit = "flags" }, + { "ssse3" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSSE3 }, .unit = "flags" }, + { "atom" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ATOM }, .unit = "flags" }, + { "sse4.1" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE4 }, .unit = "flags" }, + { "sse4.2" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_SSE42 }, .unit = "flags" }, + { "avx" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_AVX }, .unit = "flags" }, + { "xop" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_XOP }, .unit = "flags" }, + { "fma4" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_FMA4 }, .unit = "flags" }, + { "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOW }, .unit = "flags" }, + { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOWEXT }, .unit = "flags" }, +#elif ARCH_ARM + { "armv5te", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV5TE }, .unit = "flags" }, + { "armv6", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6 }, .unit = "flags" }, + { "armv6t2", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6T2 }, .unit = "flags" }, + { "vfp", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFP }, .unit = "flags" }, + { "vfpv3", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFPV3 }, .unit = "flags" }, + { "neon", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_NEON }, .unit = "flags" }, +#endif + { NULL }, + }; + static const AVClass class = { + .class_name = "cpuflags", + .item_name = av_default_item_name, + .option = cpuflags_opts, + .version = LIBAVUTIL_VERSION_INT, + }; + const AVClass *pclass = &class; + + return av_opt_eval_flags(&pclass, &cpuflags_opts[0], s, flags); +} #ifdef TEST #undef printf diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 4a86e6e..a72b008 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -79,6 +79,13 @@ attribute_deprecated void av_set_cpu_flags_mask(int mask); */ int av_parse_cpu_flags(const char *s); +/** + * Parse CPU caps from a string and update the given AV_CPU_* flags based on that. + * + * @return negative on error. + */ +int av_parse_cpu_caps(unsigned *flags, const char *s); + /* The following CPU-specific functions shall not be called directly. */ int ff_get_cpu_flags_arm(void); int ff_get_cpu_flags_ppc(void);

1 0

lavf: add AVFMT_SEEK_TO_PTS to indicate seeking is per PTS.
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Apr 30 15:47:58 2012 +0200| [e738811cebf4b5c1331eb4611b4a8239787f3b33] | committer: Michael Niedermayer lavf: add AVFMT_SEEK_TO_PTS to indicate seeking is per PTS. See: [FFmpeg-devel] [PATCH] Add documentation that seeking is done by DTS and not PTS Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e738811cebf4b5c13… --- libavformat/avformat.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index d2727d4..730ce12 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -351,6 +351,7 @@ typedef struct AVProbeData { #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */ #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */ #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */ +#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */ #define AVFMT_TS_NONSTRICT 0x8000000 /**< Format does not require strictly increasing timestamps, but they must still be monotonic */

1 0