April 2011 - ffmpeg-cvslog - lists.ffmpeg.org

LAVFAPI: demuxer specific options.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Apr 30 21:35:48 2011 +0200| [492026209b9b58eaf6d2ea56423f6b1e1a8a76a5] | committer: Michael Niedermayer LAVFAPI: demuxer specific options. (someone please add doxy) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=492026209b9b58eaf… --- libavformat/avformat.h | 5 +++++ libavformat/utils.c | 24 ++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 28b0574..db48a57 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -423,6 +423,8 @@ typedef struct AVInputFormat { const AVMetadataConv *metadata_conv; #endif + const AVClass *priv_class; ///< AVClass for the private context + /* private fields */ struct AVInputFormat *next; } AVInputFormat; @@ -726,6 +728,7 @@ typedef struct AVFormatContext { #define AVFMT_FLAG_NOPARSE 0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled #define AVFMT_FLAG_RTP_HINT 0x0040 ///< Add RTP hinting to the output file #define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down) +#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted) int loop_input; @@ -1040,6 +1043,8 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, int buf_size, AVFormatParameters *ap); +int av_demuxer_open(AVFormatContext *ic, AVFormatParameters *ap); + /** * Allocate an AVFormatContext. * avformat_free_context() can be used to free the context and everything diff --git a/libavformat/utils.c b/libavformat/utils.c index 493c563..7f82d2d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -429,6 +429,10 @@ int av_open_input_stream(AVFormatContext **ic_ptr, err = AVERROR(ENOMEM); goto fail; } + if (fmt->priv_class) { + *(const AVClass**)ic->priv_data= fmt->priv_class; + av_opt_set_defaults(ic->priv_data); + } } else { ic->priv_data = NULL; } @@ -437,13 +441,13 @@ int av_open_input_stream(AVFormatContext **ic_ptr, if (ic->pb) ff_id3v2_read(ic, ID3v2_DEFAULT_MAGIC); - if (ic->iformat->read_header) { + if (!(ic->flags&AVFMT_FLAG_PRIV_OPT) && ic->iformat->read_header) { err = ic->iformat->read_header(ic, ap); if (err < 0) goto fail; } - if (pb && !ic->data_offset) + if (!(ic->flags&AVFMT_FLAG_PRIV_OPT) && pb && !ic->data_offset) ic->data_offset = avio_tell(ic->pb); ic->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; @@ -470,6 +474,22 @@ int av_open_input_stream(AVFormatContext **ic_ptr, return err; } +int av_demuxer_open(AVFormatContext *ic, AVFormatParameters *ap){ + int err; + + if (ic->iformat->read_header) { + err = ic->iformat->read_header(ic, ap); + if (err < 0) + return err; + } + + if (ic->pb && !ic->data_offset) + ic->data_offset = avio_tell(ic->pb); + + return 0; +} + + /** size of probe buffer, for guessing file type from file contents */ #define PROBE_BUF_MIN 2048 #define PROBE_BUF_MAX (1<<20)

1 0

AVIDEC: use_odmc demuxer specific option. ( mostly an exmaple for demuxer specific options)
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Apr 30 21:37:11 2011 +0200| [ffdc49df25ec275c17e7f3e0ae5893185e3d9b93] | committer: Michael Niedermayer AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffdc49df25ec275c1… --- libavformat/avidec.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 97b392a..6a5d1e7 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -25,6 +25,7 @@ #include <strings.h> #include "libavutil/intreadwrite.h" #include "libavutil/bswap.h" +#include "libavutil/opt.h" #include "avformat.h" #include "avi.h" #include "dv.h" @@ -59,6 +60,7 @@ typedef struct AVIStream { } AVIStream; typedef struct { + const AVClass *class; int64_t riff_end; int64_t movi_end; int64_t fsize; @@ -70,9 +72,24 @@ typedef struct { int stream_index; DVDemuxContext* dv_demux; int odml_depth; + int use_odml; #define MAX_ODML_DEPTH 1000 } AVIContext; + +static const AVOption options[] = { + { "use_odml", "use odml index", offsetof(AVIContext, use_odml), FF_OPT_TYPE_INT, 1, -1, 1, AV_OPT_FLAG_DECODING_PARAM}, + { NULL }, +}; + +static const AVClass demuxer_class = { + "AVI demuxer", + av_default_item_name, + options, + LIBAVUTIL_VERSION_INT, +}; + + static const char avi_headers[][8] = { { 'R', 'I', 'F', 'F', 'A', 'V', 'I', ' ' }, { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' }, @@ -354,6 +371,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) if (get_riff(s, pb) < 0) return -1; + av_log(avi, AV_LOG_DEBUG, "use odml:%d\n", avi->use_odml); + avi->fsize = avio_size(pb); if(avi->fsize<=0) avi->fsize= avi->riff_end == 8 ? INT64_MAX : avi->riff_end; @@ -673,7 +692,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) break; case MKTAG('i', 'n', 'd', 'x'): i= avio_tell(pb); - if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX)){ + if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && avi->use_odml){ read_braindead_odml_indx(s, 0); } avio_seek(pb, i+size, SEEK_SET); @@ -1385,4 +1404,5 @@ AVInputFormat ff_avi_demuxer = { avi_read_packet, avi_read_close, avi_read_seek, + .priv_class = &demuxer_class, };

1 0

output_example: use avformat_alloc_output_context()
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Apr 30 20:44:09 2011 +0200| [ce62b35c313c2618c2e3b49cae3441b3a7dd29fe] | committer: Michael Niedermayer output_example: use avformat_alloc_output_context() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce62b35c313c2618c… --- libavformat/output-example.c | 27 +++++---------------------- 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/libavformat/output-example.c b/libavformat/output-example.c index ddd16f1..ac35ff0 100644 --- a/libavformat/output-example.c +++ b/libavformat/output-example.c @@ -442,26 +442,16 @@ int main(int argc, char **argv) filename = argv[1]; - /* auto detect the output format from the name. default is - mpeg. */ - fmt = av_guess_format(NULL, filename, NULL); - if (!fmt) { + /* allocate the output media context */ + oc = avformat_alloc_output_context(NULL, NULL, filename); + if (!oc) { printf("Could not deduce output format from file extension: using MPEG.\n"); - fmt = av_guess_format("mpeg", NULL, NULL); + oc = avformat_alloc_output_context("mpeg", NULL, filename); } - if (!fmt) { - fprintf(stderr, "Could not find suitable output format\n"); - exit(1); - } - - /* allocate the output media context */ - oc = avformat_alloc_context(); if (!oc) { - fprintf(stderr, "Memory error\n"); exit(1); } - oc->oformat = fmt; - snprintf(oc->filename, sizeof(oc->filename), "%s", filename); + fmt= oc->oformat; /* add the audio and video streams using the default format codecs and initialize the codecs */ @@ -474,13 +464,6 @@ int main(int argc, char **argv) audio_st = add_audio_stream(oc, fmt->audio_codec); } - /* set the output parameters (must be done even if no - parameters). */ - if (av_set_parameters(oc, NULL) < 0) { - fprintf(stderr, "Invalid output format parameters\n"); - exit(1); - } - av_dump_format(oc, 0, filename, 1); /* now that all the parameters are set, we can open the audio and

1 0

LAVF API: remove AVOutputFormat.set_parameters() the field is unused.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Apr 30 20:03:16 2011 +0200| [a2eef3e9f579db4278ff32cba6281452a163b05f] | committer: Michael Niedermayer LAVF API: remove AVOutputFormat.set_parameters() the field is unused. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2eef3e9f579db427… --- libavformat/avformat.h | 7 +++---- libavformat/utils.c | 5 ----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2f41f72..c77cbbb 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -285,10 +285,9 @@ typedef struct AVOutputFormat { * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS */ int flags; - /** - * Currently only used to set pixel format if not YUV420P. - */ - int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *); + + void *dummy; + int (*interleave_packet)(struct AVFormatContext *, AVPacket *out, AVPacket *in, int flush); diff --git a/libavformat/utils.c b/libavformat/utils.c index e7ce911..501a411 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2716,11 +2716,6 @@ int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap) } else s->priv_data = NULL; - if (s->oformat->set_parameters) { - ret = s->oformat->set_parameters(s, ap); - if (ret < 0) - return ret; - } return 0; }

1 0

LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Apr 30 20:43:16 2011 +0200| [7d727f1338fb23ce26975ba0e5487d2fa5783d16] | committer: Michael Niedermayer LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d727f1338fb23ce2… --- ffmpeg.c | 23 +++-------------------- libavformat/avformat.h | 9 ++++++++- libavformat/utils.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 21 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index b61df52..bde23e0 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3779,30 +3779,13 @@ static void opt_output_file(const char *filename) if (!strcmp(filename, "-")) filename = "pipe:"; - oc = avformat_alloc_context(); + oc = avformat_alloc_output_context(last_asked_format, NULL, filename); + last_asked_format = NULL; if (!oc) { print_error(filename, AVERROR(ENOMEM)); ffmpeg_exit(1); } - - if (last_asked_format) { - file_oformat = av_guess_format(last_asked_format, NULL, NULL); - if (!file_oformat) { - fprintf(stderr, "Requested output format '%s' is not a suitable output format\n", last_asked_format); - ffmpeg_exit(1); - } - last_asked_format = NULL; - } else { - file_oformat = av_guess_format(NULL, filename, NULL); - if (!file_oformat) { - fprintf(stderr, "Unable to find a suitable output format for '%s'\n", - filename); - ffmpeg_exit(1); - } - } - - oc->oformat = file_oformat; - av_strlcpy(oc->filename, filename, sizeof(oc->filename)); + file_oformat= oc->oformat; if (!strcmp(file_oformat->name, "ffm") && av_strstart(filename, "http:", NULL)) { diff --git a/libavformat/avformat.h b/libavformat/avformat.h index c77cbbb..28b0574 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1048,6 +1048,13 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, AVFormatContext *avformat_alloc_context(void); /** + * Allocate an AVFormatContext. + * avformat_free_context() can be used to free the context and everything + * allocated by the framework within it. + */ +AVFormatContext *avformat_alloc_output_context(const char *format, AVOutputFormat *oformat, const char *filename); + +/** * Read packets of a media file to get stream information. This * is useful for file formats with no headers such as MPEG. This * function also computes the real framerate in case of MPEG-2 repeat @@ -1295,7 +1302,7 @@ int64_t av_gen_search(AVFormatContext *s, int stream_index, /** * media file output */ -int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap); +attribute_deprecated int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap); /** * Split a URL string into components. diff --git a/libavformat/utils.c b/libavformat/utils.c index 501a411..493c563 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2719,6 +2719,50 @@ int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap) return 0; } +AVFormatContext *avformat_alloc_output_context(const char *format, AVOutputFormat *oformat, const char *filename){ + AVFormatContext *s= avformat_alloc_context(); + if(!s) + goto nomem; + + if(!oformat){ + if (format) { + oformat = av_guess_format(format, NULL, NULL); + if (!oformat) { + av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format); + goto error; + } + } else { + oformat = av_guess_format(NULL, filename, NULL); + if (!oformat) { + av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", + filename); + goto error; + } + } + } + + s->oformat= oformat; + if (s->oformat->priv_data_size > 0) { + s->priv_data = av_mallocz(s->oformat->priv_data_size); + if (!s->priv_data) + goto nomem; + if (s->oformat->priv_class) { + *(const AVClass**)s->priv_data= s->oformat->priv_class; + av_opt_set_defaults(s->priv_data); + } + } else + s->priv_data = NULL; + + if(filename) + av_strlcpy(s->filename, filename, sizeof(s->filename)); + return s; +nomem: + av_log(s, AV_LOG_ERROR, "Out of memory\n"); +error: + avformat_free_context(s); + return NULL; +} + static int validate_codec_tag(AVFormatContext *s, AVStream *st) { const AVCodecTag *avctag;

1 0

CrystalHD: Add auto-detection of packed b-frame bug.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Philip Langdale <philipl(a)overt.org> | Wed Apr 20 21:43:29 2011 -0700| [8de45adb37bb0591626645e1f7d1303339b2bc9f] | committer: Philip Langdale CrystalHD: Add auto-detection of packed b-frame bug. I still don't fully understand the cause but the difference between the samples that trigger the bug and the samples that don't is that the former uses delay frames and the later uses drop frames as placeholders for the packed frame. So, if we see the one type of frame, we can assume the bug will or won't be present. Right now, I'm detecting the frame types by size, which may not be safe in general, but given the specific codec and file type, I expect any scenario where we encounter these frames where they aren't being used for b-frame packing won't care one way or another whether the work around is in effect or not. Signed-off-by: Philip Langdale <philipl(a)overt.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8de45adb37bb05916… --- libavcodec/crystalhd.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 1a2d60c..3c80217 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -142,6 +142,7 @@ typedef struct { /* Options */ uint32_t sWidth; + uint8_t bframe_bug; } CHDContext; static const AVOption options[] = { @@ -744,7 +745,7 @@ static inline CopyRet receive_frame(AVCodecContext *avctx, } if (avctx->codec->id == CODEC_ID_MPEG4 && - output.PicInfo.timeStamp == 0) { + output.PicInfo.timeStamp == 0 && priv->bframe_bug) { av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: Not returning packed frame twice.\n"); priv->last_picture++; @@ -810,6 +811,22 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *a av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: decode_frame\n"); + if (avpkt->size == 7 && !priv->bframe_bug) { + /* + * The use of a drop frame triggers the bug + */ + av_log(avctx, AV_LOG_INFO, + "CrystalHD: Enabling work-around for packed b-frame bug\n"); + priv->bframe_bug = 1; + } else if (avpkt->size == 8 && priv->bframe_bug) { + /* + * Delay frames don't trigger the bug + */ + av_log(avctx, AV_LOG_INFO, + "CrystalHD: Disabling work-around for packed b-frame bug\n"); + priv->bframe_bug = 0; + } + if (len) { int32_t tx_free = (int32_t)DtsTxFreeSize(dev);

1 0

[ffmpeg-web] branch master updated. e6d4bce html comment out shame page due to no one working on entries.
by ffmpeg-cvslog＠ffmpeg.org 30 Apr '11

30 Apr '11

The branch, master has been updated via e6d4bce2eeec2ca2958791fbe728cd46488deb40 (commit) from c77e70497f2097bcebf0c79e7122bb4e3ff067f1 (commit) - Log ----------------------------------------------------------------- commit e6d4bce2eeec2ca2958791fbe728cd46488deb40 Author: Compn <tempn(a)twmi.rr.com> AuthorDate: Sat Apr 30 08:03:18 2011 -0400 Commit: Compn <tempn(a)twmi.rr.com> CommitDate: Sat Apr 30 08:03:18 2011 -0400 html comment out shame page due to no one working on entries. diff --git a/src/shame b/src/shame index 8b62567..48508c8 100644 --- a/src/shame +++ b/src/shame @@ -1,6 +1,11 @@ <h1>Hall of Shame</h1> <p> +Shame page will be offline until entries are updated. +</p> + + \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: src/shame | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive --

1 0

lavc: remove disabled avcodec_decode_video() code
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala(a)poste.it> | Sat Apr 30 11:55:06 2011 +0200| [d5551265f3004d70bb349aa06bc16ce3225c6f4d] | committer: Stefano Sabatini lavc: remove disabled avcodec_decode_video() code Fix warning: libavcodec/utils.c: At top level: libavcodec/utils.c:714:5: warning: "FF_API_VIDEO_OLD" is not defined Also fix trac issue #139. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5551265f3004d70b… --- libavcodec/utils.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 45bf73f..ce33c4f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -710,23 +710,6 @@ static int64_t guess_correct_pts(AVCodecContext *ctx, return pts; } - -#if FF_API_VIDEO_OLD -int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, - const uint8_t *buf, int buf_size) -{ - AVPacket avpkt; - av_init_packet(&avpkt); - avpkt.data = buf; - avpkt.size = buf_size; - // HACK for CorePNG to decode as normal PNG by default - avpkt.flags = AV_PKT_FLAG_KEY; - - return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt); -} -#endif - int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt)

1 0

Read the album_artist, grouping and lyrics metadata.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sun Apr 24 17:02:09 2011 +0200| [543f3db9784348499a1ac1088373e2fb9100d4c0] | committer: Reimar Döffinger Read the album_artist, grouping and lyrics metadata. Our muxer writes these out, so we really should support reading them. Fixes ticket #30. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=543f3db9784348499… --- libavformat/mov.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8bb3580..fcb2735 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -144,9 +144,12 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) case MKTAG(0xa9,'n','a','m'): key = "title"; break; case MKTAG(0xa9,'a','u','t'): case MKTAG(0xa9,'A','R','T'): key = "artist"; break; + case MKTAG( 'a','A','R','T'): key = "album_artist";break; case MKTAG(0xa9,'w','r','t'): key = "composer"; break; case MKTAG( 'c','p','r','t'): case MKTAG(0xa9,'c','p','y'): key = "copyright"; break; + case MKTAG(0xa9,'g','r','p'): key = "grouping"; break; + case MKTAG(0xa9,'l','y','r'): key = "lyrics"; break; case MKTAG(0xa9,'c','m','t'): case MKTAG(0xa9,'i','n','f'): key = "comment"; break; case MKTAG(0xa9,'a','l','b'): key = "album"; break;

1 0

In libx264 wrapper, change wpredp to a codec specific option.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Baptiste Coudurier <baptiste.coudurier(a)gmail.com> | Fri Apr 29 14:13:19 2011 -0700| [97dc86b793efb9c6ac604cdfff4027fe27efa12c] | committer: Baptiste Coudurier In libx264 wrapper, change wpredp to a codec specific option. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97dc86b793efb9c6a… --- libavcodec/libx264.c | 5 ++++- libavcodec/options.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 1b4e88b..0dd954d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -41,6 +41,7 @@ typedef struct X264Context { const char *level; int fastfirstpass; const char *stats; + const char *weightp; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -252,7 +253,6 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.analyse.i_direct_mv_pred = avctx->directpred; x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED; - x4->params.analyse.i_weighted_pred = avctx->weighted_p_pred; if (avctx->me_method == ME_EPZS) x4->params.analyse.i_me_method = X264_ME_DIA; @@ -302,6 +302,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.p_log_private = avctx; x4->params.i_log_level = X264_LOG_DEBUG; + OPT_STR("weightp", x4->weightp); + x4->params.b_intra_refresh = avctx->flags2 & CODEC_FLAG2_INTRA_REFRESH; x4->params.rc.i_bitrate = avctx->bit_rate / 1000; x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000; @@ -404,6 +406,7 @@ static const AVOption options[] = { {"profile", "Set profile restrictions", OFFSET(profile), FF_OPT_TYPE_STRING, 0, 0, 0, VE}, {"level", "Specify level (as defined by Annex A)", OFFSET(level), FF_OPT_TYPE_STRING, 0, 0, 0, VE}, {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), FF_OPT_TYPE_STRING, 0, 0, 0, VE}, + {"wpredp", "Weighted prediction for P-frames", OFFSET(weightp), FF_OPT_TYPE_STRING, 0, 0, 0, VE}, { NULL }, }; diff --git a/libavcodec/options.c b/libavcodec/options.c index 2a70b1b..05af313 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -120,7 +120,6 @@ static const AVOption options[]={ {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, 1.25, -FLT_MAX, FLT_MAX, V|E}, {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, -{"wpredp", "weighted prediction analysis method", OFFSET(weighted_p_pred), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, {"ps", "rtp payload size in bytes", OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"mv_bits", NULL, OFFSET(mv_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"header_bits", NULL, OFFSET(header_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},

1 0