September 2010 - ffmpeg-cvslog

r25268 - trunk/libavformat/avio.h
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: stefano Date: Thu Sep 30 12:55:08 2010 New Revision: 25268 Log: Document url_filesize(). Modified: trunk/libavformat/avio.h Modified: trunk/libavformat/avio.h ============================================================================== --- trunk/libavformat/avio.h Thu Sep 30 12:51:22 2010 (r25267) +++ trunk/libavformat/avio.h Thu Sep 30 12:55:08 2010 (r25268) @@ -165,6 +165,11 @@ int url_close(URLContext *h); */ int url_exist(const char *url); +/** + * Return the filesize of the resource accessed by h, AVERROR(ENOSYS) + * if the operation is not supported by h, or another negative value + * corresponding to an AVERROR error code in case of failure. + */ int64_t url_filesize(URLContext *h); /**

1 0

r25267 - trunk/libavformat/avio.c
by subversion＠mplayerhq.hu 30 Sep '10

30 Sep '10

Author: stefano Date: Thu Sep 30 12:51:22 2010 New Revision: 25267 Log: Make register_protocol() use the function av_register_protocol2() rather than av_register_protocol(), which is deprecated. Fix the GCC warning: avio.c: In function ?register_protocol?: avio.c:93: warning: ?av_register_protocol? is deprecated (declared at avio.c:86) Modified: trunk/libavformat/avio.c Modified: trunk/libavformat/avio.c ============================================================================== --- trunk/libavformat/avio.c Thu Sep 30 01:06:51 2010 (r25266) +++ trunk/libavformat/avio.c Thu Sep 30 12:51:22 2010 (r25267) @@ -90,7 +90,7 @@ int av_register_protocol(URLProtocol *pr int register_protocol(URLProtocol *protocol) { - return av_register_protocol(protocol); + return av_register_protocol2(protocol, sizeof(struct URLProtocol_compat)); } #endif

1 0

r25266 - in trunk: cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: michael Date: Thu Sep 30 01:06:51 2010 New Revision: 25266 Log: User application side of Codec specific parameters. Modified: trunk/cmdutils.c trunk/cmdutils.h trunk/ffmpeg.c trunk/ffplay.c trunk/ffprobe.c Modified: trunk/cmdutils.c ============================================================================== --- trunk/cmdutils.c Wed Sep 29 23:42:03 2010 (r25265) +++ trunk/cmdutils.c Thu Sep 30 01:06:51 2010 (r25266) @@ -49,6 +49,7 @@ #endif const char **opt_names; +const char **opt_values; static int opt_name_count; AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB]; AVFormatContext *avformat_opts; @@ -220,15 +221,25 @@ int opt_default(const char *opt, const c exit(1); } if (!o) { + AVCodec *p = NULL; + while ((p=av_codec_next(p))){ + AVClass *c= p->priv_class; + if(c && av_find_opt(&c, opt, NULL, 0, 0)) + break; + } + if(!p){ fprintf(stderr, "Unrecognized option '%s'\n", opt); exit(1); + } } // av_log(NULL, AV_LOG_ERROR, "%s:%s: %f 0x%0X\n", opt, arg, av_get_double(avcodec_opts, opt, NULL), (int)av_get_int(avcodec_opts, opt, NULL)); //FIXME we should always use avcodec_opts, ... for storing options so there will not be any need to keep track of what i set over this + opt_values= av_realloc(opt_values, sizeof(void*)*(opt_name_count+1)); + opt_values[opt_name_count]= o ? NULL : arg; opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1)); - opt_names[opt_name_count++]= o->name; + opt_names[opt_name_count++]= o ? o->name : opt; if ((*avcodec_opts && avcodec_opts[0]->debug) || (avformat_opts && avformat_opts->debug)) av_log_set_level(AV_LOG_DEBUG); @@ -283,9 +294,16 @@ int opt_timelimit(const char *opt, const return 0; } -void set_context_opts(void *ctx, void *opts_ctx, int flags) +void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec) { int i; + void *priv_ctx=NULL; + if(!strcmp("AVCodecContext", (*(AVClass**)ctx)->class_name)){ + AVCodecContext *avctx= ctx; + if(codec && codec->priv_class && avctx->priv_data){ + priv_ctx= avctx->priv_data; + } + } for(i=0; i<opt_name_count; i++){ char buf[256]; const AVOption *opt; @@ -293,6 +311,12 @@ void set_context_opts(void *ctx, void *o /* if an option with name opt_names[i] is present in opts_ctx then str is non-NULL */ if(str && ((opt->flags & flags) == flags)) av_set_string3(ctx, opt_names[i], str, 1, NULL); + /* We need to use a differnt system to pass options to the private context because + it is not known which codec and thus context kind that will be when parsing options + we thus use opt_values directly instead of opts_ctx */ + if(!str && priv_ctx && av_get_string(priv_ctx, opt_names[i], &opt, buf, sizeof(buf))){ + av_set_string3(priv_ctx, opt_names[i], opt_values[i], 1, NULL); + } } } Modified: trunk/cmdutils.h ============================================================================== --- trunk/cmdutils.h Wed Sep 29 23:42:03 2010 (r25265) +++ trunk/cmdutils.h Thu Sep 30 01:06:51 2010 (r25266) @@ -138,7 +138,7 @@ void show_help_options(const OptionDef * void parse_options(int argc, char **argv, const OptionDef *options, void (* parse_arg_function)(const char*)); -void set_context_opts(void *ctx, void *opts_ctx, int flags); +void set_context_opts(void *ctx, void *opts_ctx, int flags, AVCodec *codec); /** * Print an error message to stderr, indicating filename and a human Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Wed Sep 29 23:42:03 2010 (r25265) +++ trunk/ffmpeg.c Thu Sep 30 01:06:51 2010 (r25266) @@ -3155,7 +3155,7 @@ static void opt_input_file(const char *f ap->channel = video_channel; ap->standard = video_standard; - set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM); + set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM, NULL); ic->video_codec_id = find_codec_or_die(video_codec_name , AVMEDIA_TYPE_VIDEO , 0, @@ -3235,13 +3235,13 @@ static void opt_input_file(const char *f avcodec_thread_init(dec, thread_count); switch (dec->codec_type) { case AVMEDIA_TYPE_AUDIO: - set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM); + input_codecs[nb_icodecs++] = avcodec_find_decoder_by_name(audio_codec_name); + set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM, input_codecs[nb_icodecs-1]); //fprintf(stderr, "\nInput Audio channels: %d", dec->channels); channel_layout = dec->channel_layout; audio_channels = dec->channels; audio_sample_rate = dec->sample_rate; audio_sample_fmt = dec->sample_fmt; - input_codecs[nb_icodecs++] = avcodec_find_decoder_by_name(audio_codec_name); if(audio_disable) st->discard= AVDISCARD_ALL; /* Note that av_find_stream_info can add more streams, and we @@ -3251,7 +3251,8 @@ static void opt_input_file(const char *f audio_sample_rate >>= dec->lowres; break; case AVMEDIA_TYPE_VIDEO: - set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_VIDEO], AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM); + input_codecs[nb_icodecs++] = avcodec_find_decoder_by_name(video_codec_name); + set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_VIDEO], AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM, input_codecs[nb_icodecs-1]); frame_height = dec->height; frame_width = dec->width; if(ic->streams[i]->sample_aspect_ratio.num) @@ -3282,7 +3283,6 @@ static void opt_input_file(const char *f frame_rate.num = rfps; frame_rate.den = rfps_base; - input_codecs[nb_icodecs++] = avcodec_find_decoder_by_name(video_codec_name); if(video_disable) st->discard= AVDISCARD_ALL; else if(video_discard) @@ -3361,13 +3361,27 @@ static void new_video_stream(AVFormatCon AVStream *st; AVCodecContext *video_enc; enum CodecID codec_id; + AVCodec *codec= NULL; st = av_new_stream(oc, streamid_map[oc->nb_streams]); if (!st) { fprintf(stderr, "Could not alloc stream\n"); ffmpeg_exit(1); } - avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO); + + if(!video_stream_copy){ + if (video_codec_name) { + codec_id = find_codec_or_die(video_codec_name, AVMEDIA_TYPE_VIDEO, 1, + avcodec_opts[AVMEDIA_TYPE_VIDEO]->strict_std_compliance); + codec = avcodec_find_encoder_by_name(video_codec_name); + output_codecs[nb_ocodecs] = codec; + } else { + codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO); + codec = avcodec_find_encoder(codec_id); + } + } + + avcodec_get_context_defaults3(st->codec, codec); bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters; video_bitstream_filters= NULL; @@ -3396,22 +3410,10 @@ static void new_video_stream(AVFormatCon } else { const char *p; int i; - AVCodec *codec; AVRational fps= frame_rate.num ? frame_rate : (AVRational){25,1}; - if (video_codec_name) { - codec_id = find_codec_or_die(video_codec_name, AVMEDIA_TYPE_VIDEO, 1, - avcodec_opts[AVMEDIA_TYPE_VIDEO]->strict_std_compliance); - codec = avcodec_find_encoder_by_name(video_codec_name); - output_codecs[nb_ocodecs] = codec; - } else { - codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO); - codec = avcodec_find_encoder(codec_id); - } - video_enc->codec_id = codec_id; - - set_context_opts(video_enc, avcodec_opts[AVMEDIA_TYPE_VIDEO], AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM); + set_context_opts(video_enc, avcodec_opts[AVMEDIA_TYPE_VIDEO], AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, codec); if (codec && codec->supported_framerates && !force_fps) fps = codec->supported_framerates[av_find_nearest_q_idx(fps, codec->supported_framerates)]; @@ -3497,6 +3499,7 @@ static void new_video_stream(AVFormatCon static void new_audio_stream(AVFormatContext *oc) { AVStream *st; + AVCodec *codec= NULL; AVCodecContext *audio_enc; enum CodecID codec_id; @@ -3505,7 +3508,20 @@ static void new_audio_stream(AVFormatCon fprintf(stderr, "Could not alloc stream\n"); ffmpeg_exit(1); } - avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_AUDIO); + + if(!audio_stream_copy){ + if (audio_codec_name) { + codec_id = find_codec_or_die(audio_codec_name, AVMEDIA_TYPE_AUDIO, 1, + avcodec_opts[AVMEDIA_TYPE_AUDIO]->strict_std_compliance); + codec = avcodec_find_encoder_by_name(audio_codec_name); + output_codecs[nb_ocodecs] = codec; + } else { + codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_AUDIO); + codec = avcodec_find_encoder(codec_id); + } + } + + avcodec_get_context_defaults3(st->codec, codec); bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters; audio_bitstream_filters= NULL; @@ -3527,20 +3543,8 @@ static void new_audio_stream(AVFormatCon audio_enc->channels = audio_channels; audio_enc->sample_rate = audio_sample_rate; } else { - AVCodec *codec; - - set_context_opts(audio_enc, avcodec_opts[AVMEDIA_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM); - - if (audio_codec_name) { - codec_id = find_codec_or_die(audio_codec_name, AVMEDIA_TYPE_AUDIO, 1, - avcodec_opts[AVMEDIA_TYPE_AUDIO]->strict_std_compliance); - codec = avcodec_find_encoder_by_name(audio_codec_name); - output_codecs[nb_ocodecs] = codec; - } else { - codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_AUDIO); - codec = avcodec_find_encoder(codec_id); - } audio_enc->codec_id = codec_id; + set_context_opts(audio_enc, avcodec_opts[AVMEDIA_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM, codec); if (audio_qscale > QSCALE_NONE) { audio_enc->flags |= CODEC_FLAG_QSCALE; @@ -3571,6 +3575,7 @@ static void new_audio_stream(AVFormatCon static void new_subtitle_stream(AVFormatContext *oc) { AVStream *st; + AVCodec *codec=NULL; AVCodecContext *subtitle_enc; st = av_new_stream(oc, streamid_map[oc->nb_streams]); @@ -3578,12 +3583,17 @@ static void new_subtitle_stream(AVFormat fprintf(stderr, "Could not alloc stream\n"); ffmpeg_exit(1); } - avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_SUBTITLE); + subtitle_enc = st->codec; + if(!subtitle_stream_copy){ + subtitle_enc->codec_id = find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 1, + avcodec_opts[AVMEDIA_TYPE_SUBTITLE]->strict_std_compliance); + codec= output_codecs[nb_ocodecs] = avcodec_find_encoder_by_name(subtitle_codec_name); + } + avcodec_get_context_defaults3(st->codec, codec); bitstream_filters[nb_output_files][oc->nb_streams - 1]= subtitle_bitstream_filters; subtitle_bitstream_filters= NULL; - subtitle_enc = st->codec; subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE; if(subtitle_codec_tag) @@ -3592,10 +3602,7 @@ static void new_subtitle_stream(AVFormat if (subtitle_stream_copy) { st->stream_copy = 1; } else { - set_context_opts(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], subtitle_enc, AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM); - subtitle_enc->codec_id = find_codec_or_die(subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, 1, - avcodec_opts[AVMEDIA_TYPE_SUBTITLE]->strict_std_compliance); - output_codecs[nb_ocodecs] = avcodec_find_encoder_by_name(subtitle_codec_name); + set_context_opts(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], subtitle_enc, AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM, codec); } nb_ocodecs++; @@ -3791,7 +3798,7 @@ static void opt_output_file(const char * oc->loop_output = loop_output; oc->flags |= AVFMT_FLAG_NONBLOCK; - set_context_opts(oc, avformat_opts, AV_OPT_FLAG_ENCODING_PARAM); + set_context_opts(oc, avformat_opts, AV_OPT_FLAG_ENCODING_PARAM, NULL); memset(streamid_map, 0, sizeof(streamid_map)); } Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Wed Sep 29 23:42:03 2010 (r25265) +++ trunk/ffplay.c Thu Sep 30 01:06:51 2010 (r25266) @@ -2280,7 +2280,7 @@ static int stream_component_open(VideoSt avctx->error_concealment= error_concealment; avcodec_thread_init(avctx, thread_count); - set_context_opts(avctx, avcodec_opts[avctx->codec_type], 0); + set_context_opts(avctx, avcodec_opts[avctx->codec_type], 0, codec); if (!codec || avcodec_open(avctx, codec) < 0) @@ -2458,7 +2458,7 @@ static int decode_thread(void *arg) ap->time_base= (AVRational){1, 25}; ap->pix_fmt = frame_pix_fmt; - set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM); + set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM, NULL); err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap); if (err < 0) { Modified: trunk/ffprobe.c ============================================================================== --- trunk/ffprobe.c Wed Sep 29 23:42:03 2010 (r25265) +++ trunk/ffprobe.c Thu Sep 30 01:06:51 2010 (r25266) @@ -269,7 +269,7 @@ static int open_input_file(AVFormatConte AVFormatContext *fmt_ctx; fmt_ctx = avformat_alloc_context(); - set_context_opts(fmt_ctx, avformat_opts, AV_OPT_FLAG_DECODING_PARAM); + set_context_opts(fmt_ctx, avformat_opts, AV_OPT_FLAG_DECODING_PARAM, NULL); if ((err = av_open_input_file(&fmt_ctx, filename, iformat, 0, NULL)) < 0) { print_error(filename, err);

1 0

r25254 - trunk/libavcodec/x86/h264dsp_mmx.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: rbultje Date: Wed Sep 29 16:02:32 2010 New Revision: 25254 Log: Remove d_idx as a variable, and instead load it as a constant in the asm. This has no measurable speed effect because the surrounding code doesn't take advantage of this yet. Modified: trunk/libavcodec/x86/h264dsp_mmx.c Modified: trunk/libavcodec/x86/h264dsp_mmx.c ============================================================================== --- trunk/libavcodec/x86/h264dsp_mmx.c Wed Sep 29 15:35:24 2010 (r25253) +++ trunk/libavcodec/x86/h264dsp_mmx.c Wed Sep 29 16:02:32 2010 (r25254) @@ -66,9 +66,8 @@ void ff_h264_idct_add8_sse2 (uint8_ static av_always_inline void h264_loop_filter_strength_iteration_mmx2(int16_t bS[2][4][4], uint8_t nnz[40], int8_t ref[2][40], int16_t mv[2][40][2], int bidir, int edges, int step, - int mask_mv, int dir) + int mask_mv, int dir, const int d_idx) { - const x86_reg d_idx = dir ? -8 : -1; DECLARE_ALIGNED(8, const uint64_t, mask_dir) = dir ? 0 : 0xffffffffffffffffULL; int b_idx, edge; for( b_idx=12, edge=0; edge<edges; edge+=step, b_idx+=8*step ) { @@ -79,23 +78,23 @@ static av_always_inline void h264_loop_f if(!(mask_mv & edge)) { if(bidir) { __asm__ volatile( - "movd (%1,%0), %%mm2 \n" - "punpckldq 40(%1,%0), %%mm2 \n" // { ref0[bn], ref1[bn] } - "pshufw $0x44, (%1), %%mm0 \n" // { ref0[b], ref0[b] } - "pshufw $0x44, 40(%1), %%mm1 \n" // { ref1[b], ref1[b] } + "movd %a2(%0), %%mm2 \n" + "punpckldq %a3(%0), %%mm2 \n" // { ref0[bn], ref1[bn] } + "pshufw $0x44, (%0), %%mm0 \n" // { ref0[b], ref0[b] } + "pshufw $0x44, 40(%0), %%mm1 \n" // { ref1[b], ref1[b] } "pshufw $0x4E, %%mm2, %%mm3 \n" "psubb %%mm2, %%mm0 \n" // { ref0[b]!=ref0[bn], ref0[b]!=ref1[bn] } "psubb %%mm3, %%mm1 \n" // { ref1[b]!=ref1[bn], ref1[b]!=ref0[bn] } "por %%mm1, %%mm0 \n" - "movq (%2,%0,4), %%mm1 \n" - "movq 8(%2,%0,4), %%mm2 \n" + "movq %a4(%1), %%mm1 \n" + "movq %a5(%1), %%mm2 \n" "movq %%mm1, %%mm3 \n" "movq %%mm2, %%mm4 \n" - "psubw (%2), %%mm1 \n" - "psubw 8(%2), %%mm2 \n" - "psubw 160(%2), %%mm3 \n" - "psubw 168(%2), %%mm4 \n" + "psubw (%1), %%mm1 \n" + "psubw 8(%1), %%mm2 \n" + "psubw 160(%1), %%mm3 \n" + "psubw 168(%1), %%mm4 \n" "packsswb %%mm2, %%mm1 \n" "packsswb %%mm4, %%mm3 \n" "paddb %%mm6, %%mm1 \n" @@ -105,14 +104,14 @@ static av_always_inline void h264_loop_f "packsswb %%mm3, %%mm1 \n" "por %%mm1, %%mm0 \n" - "movq 160(%2,%0,4), %%mm1 \n" - "movq 168(%2,%0,4), %%mm2 \n" + "movq %a6(%1), %%mm1 \n" + "movq %a7(%1), %%mm2 \n" "movq %%mm1, %%mm3 \n" "movq %%mm2, %%mm4 \n" - "psubw (%2), %%mm1 \n" - "psubw 8(%2), %%mm2 \n" - "psubw 160(%2), %%mm3 \n" - "psubw 168(%2), %%mm4 \n" + "psubw (%1), %%mm1 \n" + "psubw 8(%1), %%mm2 \n" + "psubw 160(%1), %%mm3 \n" + "psubw 168(%1), %%mm4 \n" "packsswb %%mm2, %%mm1 \n" "packsswb %%mm4, %%mm3 \n" "paddb %%mm6, %%mm1 \n" @@ -125,34 +124,41 @@ static av_always_inline void h264_loop_f "por %%mm1, %%mm0 \n" "pshufw $0x4E, %%mm0, %%mm1 \n" "pminub %%mm1, %%mm0 \n" - ::"r"(d_idx), - "r"(ref[0]+b_idx), - "r"(mv[0]+b_idx) + ::"r"(ref[0]+b_idx), + "r"(mv[0]+b_idx), + "i"(d_idx), + "i"(d_idx+40), + "i"(d_idx*4), + "i"(d_idx*4+8), + "i"(d_idx*4+160), + "i"(d_idx*4+168) ); } else { __asm__ volatile( "movd (%1), %%mm0 \n" - "psubb (%1,%0), %%mm0 \n" // ref[b] != ref[bn] + "psubb %a0(%1), %%mm0 \n" // ref[b] != ref[bn] "movq (%2), %%mm1 \n" "movq 8(%2), %%mm2 \n" - "psubw (%2,%0,4), %%mm1 \n" - "psubw 8(%2,%0,4), %%mm2 \n" + "psubw %a3(%2), %%mm1 \n" + "psubw %a4(%2), %%mm2 \n" "packsswb %%mm2, %%mm1 \n" "paddb %%mm6, %%mm1 \n" "psubusb %%mm5, %%mm1 \n" // abs(mv[b] - mv[bn]) >= limit "packsswb %%mm1, %%mm1 \n" "por %%mm1, %%mm0 \n" - ::"r"(d_idx), + ::"i"(d_idx), "r"(ref[0]+b_idx), - "r"(mv[0]+b_idx) + "r"(mv[0]+b_idx), + "i"(d_idx*4), + "i"(d_idx*4+8) ); } } __asm__ volatile( - "movd %0, %%mm1 \n" - "por %1, %%mm1 \n" // nnz[b] || nnz[bn] - ::"m"(nnz[b_idx]), - "m"(nnz[b_idx+d_idx]) + "movd (%0), %%mm1 \n" + "por %a1(%0), %%mm1 \n" // nnz[b] || nnz[bn] + ::"r"(nnz+b_idx), + "i"(d_idx) ); __asm__ volatile( "pminub %%mm7, %%mm1 \n" @@ -187,8 +193,8 @@ static void h264_loop_filter_strength_mm // could do a special case for dir==0 && edges==1, but it only reduces the // average filter time by 1.2% - h264_loop_filter_strength_iteration_mmx2(bS, nnz, ref, mv, bidir, edges, step, mask_mv1, 1); - h264_loop_filter_strength_iteration_mmx2(bS, nnz, ref, mv, bidir, 4, 1, mask_mv0, 0); + h264_loop_filter_strength_iteration_mmx2(bS, nnz, ref, mv, bidir, edges, step, mask_mv1, 1, -8); + h264_loop_filter_strength_iteration_mmx2(bS, nnz, ref, mv, bidir, 4, 1, mask_mv0, 0, -1); __asm__ volatile( "movq (%0), %%mm0 \n\t"

4 10

r32415 - trunk/libswscale/utils.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: stefano Date: Thu Sep 30 00:06:44 2010 New Revision: 32415 Log: Set default values for the scale context in sws_alloc_context(). Modified: trunk/libswscale/utils.c Modified: trunk/libswscale/utils.c ============================================================================== --- trunk/libswscale/utils.c Thu Sep 30 00:06:40 2010 (r32414) +++ trunk/libswscale/utils.c Thu Sep 30 00:06:44 2010 (r32415) @@ -43,6 +43,7 @@ #include "libavutil/x86_cpu.h" #include "libavutil/avutil.h" #include "libavutil/bswap.h" +#include "libavutil/opt.h" #include "libavutil/pixdesc.h" unsigned swscale_version(void) @@ -746,6 +747,7 @@ SwsContext *sws_alloc_context(void) SwsContext *c= av_mallocz(sizeof(SwsContext)); c->av_class = &sws_context_class; + av_opt_set_defaults(c); return c; } @@ -1154,9 +1156,6 @@ SwsContext *sws_getContext(int srcW, int if (param) { c->param[0] = param[0]; c->param[1] = param[1]; - } else { - c->param[0] = - c->param[1] = SWS_PARAM_DEFAULT; } sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], c->srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, c->dstRange, 0, 1<<16, 1<<16);

1 0

r32414 - trunk/libswscale/options.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: stefano Date: Thu Sep 30 00:06:40 2010 New Revision: 32414 Log: Set the default value of param0 and param1 to SWS_PARAM_DEFAULT. Modified: trunk/libswscale/options.c Modified: trunk/libswscale/options.c ============================================================================== --- trunk/libswscale/options.c Thu Sep 30 00:06:36 2010 (r32413) +++ trunk/libswscale/options.c Thu Sep 30 00:06:40 2010 (r32414) @@ -66,8 +66,8 @@ static const AVOption options[] = { { "dst_format", "destination format", OFFSET(dstFormat), FF_OPT_TYPE_INT, DEFAULT, 0, PIX_FMT_NB-1, VE }, { "src_range" , "source range" , OFFSET(srcRange) , FF_OPT_TYPE_INT, DEFAULT, 0, 1, VE }, { "dst_range" , "destination range" , OFFSET(dstRange) , FF_OPT_TYPE_INT, DEFAULT, 0, 1, VE }, - { "param0" , "scaler param 0" , OFFSET(param[0]) , FF_OPT_TYPE_DOUBLE, DEFAULT, INT_MIN, INT_MAX, VE }, - { "param1" , "scaler param 1" , OFFSET(param[1]) , FF_OPT_TYPE_DOUBLE, DEFAULT, INT_MIN, INT_MAX, VE }, + { "param0" , "scaler param 0" , OFFSET(param[0]) , FF_OPT_TYPE_DOUBLE, SWS_PARAM_DEFAULT, INT_MIN, INT_MAX, VE }, + { "param1" , "scaler param 1" , OFFSET(param[1]) , FF_OPT_TYPE_DOUBLE, SWS_PARAM_DEFAULT, INT_MIN, INT_MAX, VE }, { NULL } };

1 0

r32413 - trunk/libswscale/options.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: stefano Date: Thu Sep 30 00:06:36 2010 New Revision: 32413 Log: Set valid default values for the srcw, srch, dstw, dsth options in the scale context. Prevent pointless warnings when using av_opt_set_defaults() for setting the default values, as in a pending patch. Modified: trunk/libswscale/options.c Modified: trunk/libswscale/options.c ============================================================================== --- trunk/libswscale/options.c Wed Sep 29 21:43:34 2010 (r32412) +++ trunk/libswscale/options.c Thu Sep 30 00:06:36 2010 (r32413) @@ -58,10 +58,10 @@ static const AVOption options[] = { { "full_chroma_inp", "full chroma input", 0 , FF_OPT_TYPE_CONST, SWS_FULL_CHR_H_INP, INT_MIN, INT_MAX, VE, "sws_flags" }, { "bitexact", "", 0 , FF_OPT_TYPE_CONST, SWS_BITEXACT, INT_MIN, INT_MAX, VE, "sws_flags" }, - { "srcw", "source width" , OFFSET(srcW), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE }, - { "srch", "source height" , OFFSET(srcH), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE }, - { "dstw", "destination width" , OFFSET(dstW), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE }, - { "dsth", "destination height", OFFSET(dstH), FF_OPT_TYPE_INT, DEFAULT, 1, INT_MAX, VE }, + { "srcw", "source width" , OFFSET(srcW), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE }, + { "srch", "source height" , OFFSET(srcH), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE }, + { "dstw", "destination width" , OFFSET(dstW), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE }, + { "dsth", "destination height", OFFSET(dstH), FF_OPT_TYPE_INT, 16, 1, INT_MAX, VE }, { "src_format", "source format" , OFFSET(srcFormat), FF_OPT_TYPE_INT, DEFAULT, 0, PIX_FMT_NB-1, VE }, { "dst_format", "destination format", OFFSET(dstFormat), FF_OPT_TYPE_INT, DEFAULT, 0, PIX_FMT_NB-1, VE }, { "src_range" , "source range" , OFFSET(srcRange) , FF_OPT_TYPE_INT, DEFAULT, 0, 1, VE },

1 0

r25265 - trunk/libavutil/opt.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: stefano Date: Wed Sep 29 23:42:03 2010 New Revision: 25265 Log: Add missing case for FF_OPT_TYPE_DOUBLE in av_opt_set_defaults2(). Modified: trunk/libavutil/opt.c Modified: trunk/libavutil/opt.c ============================================================================== --- trunk/libavutil/opt.c Wed Sep 29 23:35:52 2010 (r25264) +++ trunk/libavutil/opt.c Wed Sep 29 23:42:03 2010 (r25265) @@ -426,6 +426,7 @@ void av_opt_set_defaults2(void *s, int m av_log(s, AV_LOG_DEBUG, "loss of precision in default of %s\n", opt->name); av_set_int(s, opt->name, opt->default_val); break; + case FF_OPT_TYPE_DOUBLE: case FF_OPT_TYPE_FLOAT: { double val; val = opt->default_val;

1 0

r25263 - trunk/libavformat/isom.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: bcoudurier Date: Wed Sep 29 23:34:31 2010 New Revision: 25263 Log: Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx Modified: trunk/libavformat/isom.c Modified: trunk/libavformat/isom.c ============================================================================== --- trunk/libavformat/isom.c Wed Sep 29 19:42:26 2010 (r25262) +++ trunk/libavformat/isom.c Wed Sep 29 23:34:31 2010 (r25263) @@ -130,8 +130,10 @@ const AVCodecTag codec_movvideo_tags[] = { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ + { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '2') }, /* Apple MPEG-2 Camcorder */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */

1 0

r25262 - trunk/libavcodec/x86/h264dsp_mmx.c
by subversion＠mplayerhq.hu 29 Sep '10

29 Sep '10

Author: rbultje Date: Wed Sep 29 19:42:26 2010 New Revision: 25262 Log: Move static inline function to a macro, so that constant propagation in inline asm works for gcc-3.x also (hopefully). Should fix gcc-3.x FATE breakage after r25254. Modified: trunk/libavcodec/x86/h264dsp_mmx.c Modified: trunk/libavcodec/x86/h264dsp_mmx.c ============================================================================== --- trunk/libavcodec/x86/h264dsp_mmx.c Wed Sep 29 17:43:37 2010 (r25261) +++ trunk/libavcodec/x86/h264dsp_mmx.c Wed Sep 29 19:42:26 2010 (r25262) @@ -63,123 +63,119 @@ void ff_h264_idct_add8_sse2 (uint8_ /***********************************/ /* deblocking */ -static av_always_inline void h264_loop_filter_strength_iteration_mmx2(int16_t bS[2][4][4], uint8_t nnz[40], - int8_t ref[2][40], int16_t mv[2][40][2], - int bidir, int edges, int step, - int mask_mv, int dir, const int d_idx, - const uint64_t mask_dir) -{ - x86_reg b_idx; - mask_mv <<= 3; - for( b_idx=0; b_idx<edges; b_idx+=step ) { - if (!mask_dir) - __asm__ volatile( - "pxor %%mm0, %%mm0 \n\t" - :: - ); - if(!(mask_mv & b_idx)) { - if(bidir) { - __asm__ volatile( - "movd %a3(%0,%2), %%mm2 \n" - "punpckldq %a4(%0,%2), %%mm2 \n" // { ref0[bn], ref1[bn] } - "pshufw $0x44, 12(%0,%2), %%mm0 \n" // { ref0[b], ref0[b] } - "pshufw $0x44, 52(%0,%2), %%mm1 \n" // { ref1[b], ref1[b] } - "pshufw $0x4E, %%mm2, %%mm3 \n" - "psubb %%mm2, %%mm0 \n" // { ref0[b]!=ref0[bn], ref0[b]!=ref1[bn] } - "psubb %%mm3, %%mm1 \n" // { ref1[b]!=ref1[bn], ref1[b]!=ref0[bn] } - - "por %%mm1, %%mm0 \n" - "movq %a5(%1,%2,4), %%mm1 \n" - "movq %a6(%1,%2,4), %%mm2 \n" - "movq %%mm1, %%mm3 \n" - "movq %%mm2, %%mm4 \n" - "psubw 48(%1,%2,4), %%mm1 \n" - "psubw 56(%1,%2,4), %%mm2 \n" - "psubw 208(%1,%2,4), %%mm3 \n" - "psubw 216(%1,%2,4), %%mm4 \n" - "packsswb %%mm2, %%mm1 \n" - "packsswb %%mm4, %%mm3 \n" - "paddb %%mm6, %%mm1 \n" - "paddb %%mm6, %%mm3 \n" - "psubusb %%mm5, %%mm1 \n" // abs(mv[b] - mv[bn]) >= limit - "psubusb %%mm5, %%mm3 \n" - "packsswb %%mm3, %%mm1 \n" - - "por %%mm1, %%mm0 \n" - "movq %a7(%1,%2,4), %%mm1 \n" - "movq %a8(%1,%2,4), %%mm2 \n" - "movq %%mm1, %%mm3 \n" - "movq %%mm2, %%mm4 \n" - "psubw 48(%1,%2,4), %%mm1 \n" - "psubw 56(%1,%2,4), %%mm2 \n" - "psubw 208(%1,%2,4), %%mm3 \n" - "psubw 216(%1,%2,4), %%mm4 \n" - "packsswb %%mm2, %%mm1 \n" - "packsswb %%mm4, %%mm3 \n" - "paddb %%mm6, %%mm1 \n" - "paddb %%mm6, %%mm3 \n" - "psubusb %%mm5, %%mm1 \n" // abs(mv[b] - mv[bn]) >= limit - "psubusb %%mm5, %%mm3 \n" - "packsswb %%mm3, %%mm1 \n" - - "pshufw $0x4E, %%mm1, %%mm1 \n" - "por %%mm1, %%mm0 \n" - "pshufw $0x4E, %%mm0, %%mm1 \n" - "pminub %%mm1, %%mm0 \n" - ::"r"(ref), - "r"(mv), - "r"(b_idx), - "i"(d_idx+12), - "i"(d_idx+52), - "i"(d_idx*4+48), - "i"(d_idx*4+56), - "i"(d_idx*4+208), - "i"(d_idx*4+216) - ); - } else { - __asm__ volatile( - "movd 12(%0,%2), %%mm0 \n" - "psubb %a3(%0,%2), %%mm0 \n" // ref[b] != ref[bn] - "movq 48(%1,%2,4), %%mm1 \n" - "movq 56(%1,%2,4), %%mm2 \n" - "psubw %a4(%1,%2,4), %%mm1 \n" - "psubw %a5(%1,%2,4), %%mm2 \n" - "packsswb %%mm2, %%mm1 \n" - "paddb %%mm6, %%mm1 \n" - "psubusb %%mm5, %%mm1 \n" // abs(mv[b] - mv[bn]) >= limit - "packsswb %%mm1, %%mm1 \n" - "por %%mm1, %%mm0 \n" - ::"r"(ref), - "r"(mv), - "r"(b_idx), - "i"(d_idx+12), - "i"(d_idx*4+48), - "i"(d_idx*4+56) - ); - } - } - __asm__ volatile( - "movd 12(%0,%1), %%mm1 \n" - "por %a2(%0,%1), %%mm1 \n" // nnz[b] || nnz[bn] - ::"r"(nnz), - "r"(b_idx), - "i"(d_idx+12) - ); - __asm__ volatile( - "pminub %%mm7, %%mm1 \n" - "pminub %%mm7, %%mm0 \n" - "psllw $1, %%mm1 \n" - "pxor %%mm2, %%mm2 \n" - "pmaxub %%mm0, %%mm1 \n" - "punpcklbw %%mm2, %%mm1 \n" - "movq %%mm1, %a1(%0,%2) \n" - ::"r"(bS), - "i"(32*dir), - "r"(b_idx) - :"memory" - ); - } -} +#define h264_loop_filter_strength_iteration_mmx2(bS, nz, ref, mv, bidir, edges, step, mask_mv, dir, d_idx, mask_dir) \ + do { \ + x86_reg b_idx; \ + mask_mv <<= 3; \ + for( b_idx=0; b_idx<edges; b_idx+=step ) { \ + if (!mask_dir) \ + __asm__ volatile( \ + "pxor %%mm0, %%mm0 \n\t" \ + :: \ + ); \ + if(!(mask_mv & b_idx)) { \ + if(bidir) { \ + __asm__ volatile( \ + "movd %a3(%0,%2), %%mm2 \n" \ + "punpckldq %a4(%0,%2), %%mm2 \n" /* { ref0[bn], ref1[bn] } */ \ + "pshufw $0x44, 12(%0,%2), %%mm0 \n" /* { ref0[b], ref0[b] } */ \ + "pshufw $0x44, 52(%0,%2), %%mm1 \n" /* { ref1[b], ref1[b] } */ \ + "pshufw $0x4E, %%mm2, %%mm3 \n" \ + "psubb %%mm2, %%mm0 \n" /* { ref0[b]!=ref0[bn], ref0[b]!=ref1[bn] } */ \ + "psubb %%mm3, %%mm1 \n" /* { ref1[b]!=ref1[bn], ref1[b]!=ref0[bn] } */ \ + \ + "por %%mm1, %%mm0 \n" \ + "movq %a5(%1,%2,4), %%mm1 \n" \ + "movq %a6(%1,%2,4), %%mm2 \n" \ + "movq %%mm1, %%mm3 \n" \ + "movq %%mm2, %%mm4 \n" \ + "psubw 48(%1,%2,4), %%mm1 \n" \ + "psubw 56(%1,%2,4), %%mm2 \n" \ + "psubw 208(%1,%2,4), %%mm3 \n" \ + "psubw 216(%1,%2,4), %%mm4 \n" \ + "packsswb %%mm2, %%mm1 \n" \ + "packsswb %%mm4, %%mm3 \n" \ + "paddb %%mm6, %%mm1 \n" \ + "paddb %%mm6, %%mm3 \n" \ + "psubusb %%mm5, %%mm1 \n" /* abs(mv[b] - mv[bn]) >= limit */ \ + "psubusb %%mm5, %%mm3 \n" \ + "packsswb %%mm3, %%mm1 \n" \ + \ + "por %%mm1, %%mm0 \n" \ + "movq %a7(%1,%2,4), %%mm1 \n" \ + "movq %a8(%1,%2,4), %%mm2 \n" \ + "movq %%mm1, %%mm3 \n" \ + "movq %%mm2, %%mm4 \n" \ + "psubw 48(%1,%2,4), %%mm1 \n" \ + "psubw 56(%1,%2,4), %%mm2 \n" \ + "psubw 208(%1,%2,4), %%mm3 \n" \ + "psubw 216(%1,%2,4), %%mm4 \n" \ + "packsswb %%mm2, %%mm1 \n" \ + "packsswb %%mm4, %%mm3 \n" \ + "paddb %%mm6, %%mm1 \n" \ + "paddb %%mm6, %%mm3 \n" \ + "psubusb %%mm5, %%mm1 \n" /* abs(mv[b] - mv[bn]) >= limit */ \ + "psubusb %%mm5, %%mm3 \n" \ + "packsswb %%mm3, %%mm1 \n" \ + \ + "pshufw $0x4E, %%mm1, %%mm1 \n" \ + "por %%mm1, %%mm0 \n" \ + "pshufw $0x4E, %%mm0, %%mm1 \n" \ + "pminub %%mm1, %%mm0 \n" \ + ::"r"(ref), \ + "r"(mv), \ + "r"(b_idx), \ + "i"(d_idx+12), \ + "i"(d_idx+52), \ + "i"(d_idx*4+48), \ + "i"(d_idx*4+56), \ + "i"(d_idx*4+208), \ + "i"(d_idx*4+216) \ + ); \ + } else { \ + __asm__ volatile( \ + "movd 12(%0,%2), %%mm0 \n" \ + "psubb %a3(%0,%2), %%mm0 \n" /* ref[b] != ref[bn] */ \ + "movq 48(%1,%2,4), %%mm1 \n" \ + "movq 56(%1,%2,4), %%mm2 \n" \ + "psubw %a4(%1,%2,4), %%mm1 \n" \ + "psubw %a5(%1,%2,4), %%mm2 \n" \ + "packsswb %%mm2, %%mm1 \n" \ + "paddb %%mm6, %%mm1 \n" \ + "psubusb %%mm5, %%mm1 \n" /* abs(mv[b] - mv[bn]) >= limit */ \ + "packsswb %%mm1, %%mm1 \n" \ + "por %%mm1, %%mm0 \n" \ + ::"r"(ref), \ + "r"(mv), \ + "r"(b_idx), \ + "i"(d_idx+12), \ + "i"(d_idx*4+48), \ + "i"(d_idx*4+56) \ + ); \ + } \ + } \ + __asm__ volatile( \ + "movd 12(%0,%1), %%mm1 \n" \ + "por %a2(%0,%1), %%mm1 \n" /* nnz[b] || nnz[bn] */ \ + ::"r"(nnz), \ + "r"(b_idx), \ + "i"(d_idx+12) \ + ); \ + __asm__ volatile( \ + "pminub %%mm7, %%mm1 \n" \ + "pminub %%mm7, %%mm0 \n" \ + "psllw $1, %%mm1 \n" \ + "pxor %%mm2, %%mm2 \n" \ + "pmaxub %%mm0, %%mm1 \n" \ + "punpcklbw %%mm2, %%mm1 \n" \ + "movq %%mm1, %a1(%0,%2) \n" \ + ::"r"(bS), \ + "i"(32*dir), \ + "r"(b_idx) \ + :"memory" \ + ); \ + } \ + } while (0) static void h264_loop_filter_strength_mmx2( int16_t bS[2][4][4], uint8_t nnz[40], int8_t ref[2][40], int16_t mv[2][40][2], int bidir, int edges, int step, int mask_mv0, int mask_mv1, int field ) {

1 0