diff options
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | libavcodec/aacenc.c | 49 | ||||
| -rw-r--r-- | libavcodec/psymodel.c | 13 | ||||
| -rw-r--r-- | libavcodec/psymodel.h | 49 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/mp_image.h | 1 | ||||
| -rw-r--r-- | libavutil/internal.h | 2 | ||||
| -rw-r--r-- | libavutil/log.c | 2 | ||||
| -rw-r--r-- | libpostproc/postprocess.c | 1 | ||||
| -rwxr-xr-x | tests/codec-regression.sh | 130 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 5 | ||||
| -rwxr-xr-x | tests/regression-funcs.sh | 4 |
11 files changed, 120 insertions, 138 deletions
@@ -1267,7 +1267,7 @@ static void do_video_out(AVFormatContext *s, /* better than nothing: use input picture interlaced settings */ big_picture.interlaced_frame = in_picture->interlaced_frame; - if(avcodec_opts[AVMEDIA_TYPE_VIDEO]->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)){ + if (ost->st->codec->flags & (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME)) { if(top_field_first == -1) big_picture.top_field_first = in_picture->top_field_first; else diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 8843cbdb59..b51fccded3 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -489,7 +489,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AACEncContext *s = avctx->priv_data; int16_t *samples = s->samples, *samples2, *la; ChannelElement *cpe; - int i, j, chans, tag, start_ch; + int i, ch, w, chans, tag, start_ch; const uint8_t *chan_map = aac_chan_configs[avctx->channels-1]; int chan_el_counter[4]; FFPsyWindowInfo windows[AAC_MAX_CHANNELS]; @@ -524,34 +524,33 @@ static int aac_encode_frame(AVCodecContext *avctx, tag = chan_map[i+1]; chans = tag == TYPE_CPE ? 2 : 1; cpe = &s->cpe[i]; - for (j = 0; j < chans; j++) { - IndividualChannelStream *ics = &cpe->ch[j].ics; - int k; - int cur_channel = start_ch + j; + for (ch = 0; ch < chans; ch++) { + IndividualChannelStream *ics = &cpe->ch[ch].ics; + int cur_channel = start_ch + ch; samples2 = samples + cur_channel; la = samples2 + (448+64) * avctx->channels; if (!data) la = NULL; if (tag == TYPE_LFE) { - wi[j].window_type[0] = ONLY_LONG_SEQUENCE; - wi[j].window_shape = 0; - wi[j].num_windows = 1; - wi[j].grouping[0] = 1; + wi[ch].window_type[0] = ONLY_LONG_SEQUENCE; + wi[ch].window_shape = 0; + wi[ch].num_windows = 1; + wi[ch].grouping[0] = 1; } else { - wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, cur_channel, + wi[ch] = s->psy.model->window(&s->psy, samples2, la, cur_channel, ics->window_sequence[0]); } ics->window_sequence[1] = ics->window_sequence[0]; - ics->window_sequence[0] = wi[j].window_type[0]; + ics->window_sequence[0] = wi[ch].window_type[0]; ics->use_kb_window[1] = ics->use_kb_window[0]; - ics->use_kb_window[0] = wi[j].window_shape; - ics->num_windows = wi[j].num_windows; + ics->use_kb_window[0] = wi[ch].window_shape; + ics->num_windows = wi[ch].num_windows; ics->swb_sizes = s->psy.bands [ics->num_windows == 8]; ics->num_swb = tag == TYPE_LFE ? 12 : s->psy.num_bands[ics->num_windows == 8]; - for (k = 0; k < ics->num_windows; k++) - ics->group_len[k] = wi[j].grouping[k]; + for (w = 0; w < ics->num_windows; w++) + ics->group_len[w] = wi[ch].grouping[w]; - apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2); + apply_window_and_mdct(avctx, s, &cpe->ch[ch], samples2); } start_ch += chans; } @@ -569,10 +568,10 @@ static int aac_encode_frame(AVCodecContext *avctx, cpe = &s->cpe[i]; put_bits(&s->pb, 3, tag); put_bits(&s->pb, 4, chan_el_counter[tag]++); - for (j = 0; j < chans; j++) { - s->cur_channel = start_ch + j; - ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); - s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda); + for (ch = 0; ch < chans; ch++) { + s->cur_channel = start_ch + ch; + s->psy.model->analyze(&s->psy, s->cur_channel, cpe->ch[ch].coeffs, &wi[ch]); + s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda); } cpe->common_window = 0; if (chans > 1 @@ -580,8 +579,8 @@ static int aac_encode_frame(AVCodecContext *avctx, && wi[0].window_shape == wi[1].window_shape) { cpe->common_window = 1; - for (j = 0; j < wi[0].num_windows; j++) { - if (wi[0].grouping[j] != wi[1].grouping[j]) { + for (w = 0; w < wi[0].num_windows; w++) { + if (wi[0].grouping[w] != wi[1].grouping[w]) { cpe->common_window = 0; break; } @@ -598,9 +597,9 @@ static int aac_encode_frame(AVCodecContext *avctx, encode_ms_info(&s->pb, cpe); } } - for (j = 0; j < chans; j++) { - s->cur_channel = start_ch + j; - encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); + for (ch = 0; ch < chans; ch++) { + s->cur_channel = start_ch + ch; + encode_individual_channel(avctx, s, &cpe->ch[ch], cpe->common_window); } start_ch += chans; } diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index 8bd5b8bdd8..133a85f5c1 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -45,19 +45,6 @@ av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, return 0; } -FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, - const int16_t *audio, const int16_t *la, - int channel, int prev_type) -{ - return ctx->model->window(ctx, audio, la, channel, prev_type); -} - -void ff_psy_set_band_info(FFPsyContext *ctx, int channel, - const float *coeffs, const FFPsyWindowInfo *wi) -{ - ctx->model->analyze(ctx, channel, coeffs, wi); -} - av_cold void ff_psy_end(FFPsyContext *ctx) { if (ctx->model->end) diff --git a/libavcodec/psymodel.h b/libavcodec/psymodel.h index a89b64c308..c65614a151 100644 --- a/libavcodec/psymodel.h +++ b/libavcodec/psymodel.h @@ -80,8 +80,30 @@ typedef struct FFPsyContext { typedef struct FFPsyModel { const char *name; int (*init) (FFPsyContext *apc); + + /** + * Suggest window sequence for channel. + * + * @param ctx model context + * @param audio samples for the current frame + * @param la lookahead samples (NULL when unavailable) + * @param channel number of channel element to analyze + * @param prev_type previous window type + * + * @return suggested window information in a structure + */ FFPsyWindowInfo (*window)(FFPsyContext *ctx, const int16_t *audio, const int16_t *la, int channel, int prev_type); + + /** + * Perform psychoacoustic analysis and set band info (threshold, energy). + * + * @param ctx model context + * @param channel audio channel number + * @param coeffs pointer to the transformed coefficients + * @param wi window information + */ void (*analyze)(FFPsyContext *ctx, int channel, const float *coeffs, const FFPsyWindowInfo *wi); + void (*end) (FFPsyContext *apc); } FFPsyModel; @@ -101,33 +123,6 @@ av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, const uint8_t **bands, const int* num_bands); /** - * Suggest window sequence for channel. - * - * @param ctx model context - * @param audio samples for the current frame - * @param la lookahead samples (NULL when unavailable) - * @param channel number of channel element to analyze - * @param prev_type previous window type - * - * @return suggested window information in a structure - */ -FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx, - const int16_t *audio, const int16_t *la, - int channel, int prev_type); - - -/** - * Perform psychoacoustic analysis and set band info (threshold, energy). - * - * @param ctx model context - * @param channel audio channel number - * @param coeffs pointer to the transformed coefficients - * @param wi window information - */ -void ff_psy_set_band_info(FFPsyContext *ctx, int channel, const float *coeffs, - const FFPsyWindowInfo *wi); - -/** * Cleanup model context at the end. * * @param ctx model context diff --git a/libavfilter/libmpcodecs/mp_image.h b/libavfilter/libmpcodecs/mp_image.h index 3d566af693..50d3fa19a6 100644 --- a/libavfilter/libmpcodecs/mp_image.h +++ b/libavfilter/libmpcodecs/mp_image.h @@ -33,6 +33,7 @@ #undef rand #undef srand #undef printf +#undef strncpy #define ASMALIGN(ZEROBITS) ".p2align " #ZEROBITS "\n\t" diff --git a/libavutil/internal.h b/libavutil/internal.h index 0bd842f4c6..b5cc2a6cd1 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -137,6 +137,8 @@ #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf #undef strcat #define strcat strcat_is_forbidden_due_to_security_issues_use_av_strlcat +#undef strncpy +#define strncpy strncpy_is_forbidden_due_to_security_issues_use_av_strlcpy #undef exit #define exit exit_is_forbidden #ifndef LIBAVFORMAT_BUILD diff --git a/libavutil/log.c b/libavutil/log.c index c9a4f7f9aa..fd5e2cbbe2 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -111,7 +111,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) vsnprintf(line + strlen(line), sizeof(line) - strlen(line), fmt, vl); - print_prefix= line[strlen(line)-1] == '\n'; + print_prefix = strlen(line) && line[strlen(line)-1] == '\n'; #if HAVE_ISATTY if(!is_atty) is_atty= isatty(2) ? 1 : -1; diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index d8c488c3dd..03e5f194d7 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -1104,4 +1104,3 @@ void pp_postprocess(const uint8_t * src[3], const int srcStride[3], } } } - diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index ed6fb44d71..07be0aeeb6 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -24,39 +24,39 @@ fi if [ -n "$do_mpeg" ] ; then # mpeg1 -do_video_encoding mpeg1.mpg "-qscale 10" "-f mpeg1video" +do_video_encoding mpeg1.mpg "-qscale 10 -f mpeg1video" do_video_decoding fi if [ -n "$do_mpeg2" ] ; then # mpeg2 -do_video_encoding mpeg2.mpg "-qscale 10" "-vcodec mpeg2video -f mpeg1video" +do_video_encoding mpeg2.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video" do_video_decoding # mpeg2 encoding intra vlc qprd -do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -trellis 1 -flags +qprd+mv0 -flags2 +ivlc -cmp 2 -subcmp 2 -mbd rd" "-vcodec mpeg2video -f mpeg2video" +do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -trellis 1 -flags +qprd+mv0 -flags2 +ivlc -cmp 2 -subcmp 2 -mbd rd -vcodec mpeg2video -f mpeg2video" do_video_decoding #mpeg2 4:2:2 encoding -do_video_encoding mpeg2_422.mpg "-vb 1000k -bf 2 -trellis 1 -flags +qprd+mv0+ildct+ilme -flags2 +ivlc -mbd rd" "-vcodec mpeg2video -pix_fmt yuv422p -f mpeg2video" +do_video_encoding mpeg2_422.mpg "-vb 1000k -bf 2 -trellis 1 -flags +qprd+mv0+ildct+ilme -flags2 +ivlc -mbd rd -vcodec mpeg2video -pix_fmt yuv422p -f mpeg2video" do_video_decoding # mpeg2 -do_video_encoding mpeg2.mpg "-qscale 10" "-vcodec mpeg2video -idct int -dct int -f mpeg1video" +do_video_encoding mpeg2.mpg "-qscale 10 -vcodec mpeg2video -idct int -dct int -f mpeg1video" do_video_decoding "-idct int" # mpeg2 encoding interlaced -do_video_encoding mpeg2i.mpg "-qscale 10" "-vcodec mpeg2video -f mpeg1video -flags +ildct+ilme" +do_video_encoding mpeg2i.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -flags +ildct+ilme" do_video_decoding fi if [ -n "$do_mpeg2thread" ] ; then # mpeg2 encoding interlaced -do_video_encoding mpeg2thread.mpg "-qscale 10" "-vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2" +do_video_encoding mpeg2thread.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 2" do_video_decoding # mpeg2 encoding interlaced using intra vlc -do_video_encoding mpeg2threadivlc.mpg "-qscale 10" "-vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2" +do_video_encoding mpeg2threadivlc.mpg "-qscale 10 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -flags2 +ivlc -threads 2" do_video_decoding # mpeg2 encoding interlaced @@ -66,273 +66,273 @@ do_video_decoding fi if [ -n "$do_msmpeg4v2" ] ; then -do_video_encoding msmpeg4v2.avi "-qscale 10" "-an -vcodec msmpeg4v2" +do_video_encoding msmpeg4v2.avi "-qscale 10 -an -vcodec msmpeg4v2" do_video_decoding fi if [ -n "$do_msmpeg4" ] ; then -do_video_encoding msmpeg4.avi "-qscale 10" "-an -vcodec msmpeg4" +do_video_encoding msmpeg4.avi "-qscale 10 -an -vcodec msmpeg4" do_video_decoding fi if [ -n "$do_msvideo1" ] ; then -do_video_encoding msvideo1.avi "" "-an -vcodec msvideo1" +do_video_encoding msvideo1.avi "-an -vcodec msvideo1" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_wmv1" ] ; then -do_video_encoding wmv1.avi "-qscale 10" "-an -vcodec wmv1" +do_video_encoding wmv1.avi "-qscale 10 -an -vcodec wmv1" do_video_decoding fi if [ -n "$do_wmv2" ] ; then -do_video_encoding wmv2.avi "-qscale 10" "-an -vcodec wmv2" +do_video_encoding wmv2.avi "-qscale 10 -an -vcodec wmv2" do_video_decoding fi if [ -n "$do_h261" ] ; then -do_video_encoding h261.avi "-qscale 11" "-s 352x288 -an -vcodec h261" +do_video_encoding h261.avi "-qscale 11 -s 352x288 -an -vcodec h261" do_video_decoding fi if [ -n "$do_h263" ] ; then -do_video_encoding h263.avi "-qscale 10" "-s 352x288 -an -vcodec h263" +do_video_encoding h263.avi "-qscale 10 -s 352x288 -an -vcodec h263" do_video_decoding fi if [ -n "$do_h263p" ] ; then -do_video_encoding h263p.avi "-qscale 2 -flags +umv+aiv+aic" "-s 352x288 -an -vcodec h263p -ps 300" +do_video_encoding h263p.avi "-qscale 2 -flags +umv+aiv+aic -s 352x288 -an -vcodec h263p -ps 300" do_video_decoding fi if [ -n "$do_mpeg4" ] ; then -do_video_encoding odivx.mp4 "-flags +mv4 -mbd bits -qscale 10" "-an -vcodec mpeg4" +do_video_encoding odivx.mp4 "-flags +mv4 -mbd bits -qscale 10 -an -vcodec mpeg4" do_video_decoding fi if [ -n "$do_huffyuv" ] ; then -do_video_encoding huffyuv.avi "" "-an -vcodec huffyuv -pix_fmt yuv422p -sws_flags neighbor+bitexact" +do_video_encoding huffyuv.avi "-an -vcodec huffyuv -pix_fmt yuv422p -sws_flags neighbor+bitexact" do_video_decoding "" "-strict -2 -pix_fmt yuv420p -sws_flags neighbor+bitexact" fi if [ -n "$do_rc" ] ; then -do_video_encoding mpeg4-rc.avi "-b 400k -bf 2" "-an -vcodec mpeg4" +do_video_encoding mpeg4-rc.avi "-b 400k -bf 2 -an -vcodec mpeg4" do_video_decoding fi if [ -n "$do_mpeg4adv" ] ; then -do_video_encoding mpeg4-adv.avi "-qscale 9 -flags +mv4+part+aic -trellis 1 -mbd bits -ps 200" "-an -vcodec mpeg4" +do_video_encoding mpeg4-adv.avi "-qscale 9 -flags +mv4+part+aic -trellis 1 -mbd bits -ps 200 -an -vcodec mpeg4" do_video_decoding -do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -trellis 1 -flags +mv4+qprd+mv0 -cmp 2 -subcmp 2 -mbd rd" "-an -vcodec mpeg4" +do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -trellis 1 -flags +mv4+qprd+mv0 -cmp 2 -subcmp 2 -mbd rd -an -vcodec mpeg4" do_video_decoding -do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+mv0 -trellis 1 -cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3" "-an -vcodec mpeg4" +do_video_encoding mpeg4-adap.avi "-b 550k -bf 2 -flags +mv4+mv0 -trellis 1 -cmp 1 -subcmp 2 -mbd rd -scplx_mask 0.3 -an -vcodec mpeg4" do_video_decoding -do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2" "-an -vcodec mpeg4" +do_video_encoding mpeg4-Q.avi "-qscale 7 -flags +mv4+qpel -mbd 2 -bf 2 -cmp 1 -subcmp 2 -an -vcodec mpeg4" do_video_decoding fi if [ -n "$do_mpeg4thread" ] ; then -do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic -trellis 1 -mbd bits -ps 200 -bf 2" "-an -vcodec mpeg4 -threads 2" +do_video_encoding mpeg4-thread.avi "-b 500k -flags +mv4+part+aic -trellis 1 -mbd bits -ps 200 -bf 2 -an -vcodec mpeg4 -threads 2" do_video_decoding fi if [ -n "$do_error" ] ; then -do_video_encoding error-mpeg4-adv.avi "-qscale 7 -flags +mv4+part+aic -mbd rd -ps 250 -error 10" "-an -vcodec mpeg4" +do_video_encoding error-mpeg4-adv.avi "-qscale 7 -flags +mv4+part+aic -mbd rd -ps 250 -error 10 -an -vcodec mpeg4" do_video_decoding fi if [ -n "$do_mpeg4nr" ] ; then -do_video_encoding mpeg4-nr.avi "-qscale 8 -flags +mv4 -mbd rd -nr 200" "-an -vcodec mpeg4" +do_video_encoding mpeg4-nr.avi "-qscale 8 -flags +mv4 -mbd rd -nr 200 -an -vcodec mpeg4" do_video_decoding fi if [ -n "$do_mpeg1b" ] ; then -do_video_encoding mpeg1b.mpg "-qscale 8 -bf 3 -ps 200" "-an -vcodec mpeg1video -f mpeg1video" +do_video_encoding mpeg1b.mpg "-qscale 8 -bf 3 -ps 200 -an -vcodec mpeg1video -f mpeg1video" do_video_decoding fi if [ -n "$do_mjpeg" ] ; then -do_video_encoding mjpeg.avi "-qscale 9" "-an -vcodec mjpeg -pix_fmt yuvj420p" +do_video_encoding mjpeg.avi "-qscale 9 -an -vcodec mjpeg -pix_fmt yuvj420p" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_ljpeg" ] ; then -do_video_encoding ljpeg.avi "" "-an -vcodec ljpeg -strict -1" +do_video_encoding ljpeg.avi "-an -vcodec ljpeg -strict -1" do_video_decoding fi if [ -n "$do_jpegls" ] ; then -do_video_encoding jpegls.avi "" "-an -vcodec jpegls -vtag MJPG -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact" +do_video_encoding jpegls.avi "-an -vcodec jpegls -vtag MJPG -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact" do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+bitexact" fi if [ -n "$do_rv10" ] ; then -do_video_encoding rv10.rm "-qscale 10" "-an" +do_video_encoding rv10.rm "-qscale 10 -an" do_video_decoding fi if [ -n "$do_rv20" ] ; then -do_video_encoding rv20.rm "-qscale 10" "-vcodec rv20 -an" +do_video_encoding rv20.rm "-qscale 10 -vcodec rv20 -an" do_video_decoding fi if [ -n "$do_asv1" ] ; then -do_video_encoding asv1.avi "-qscale 10" "-an -vcodec asv1" +do_video_encoding asv1.avi "-qscale 10 -an -vcodec asv1" do_video_decoding fi if [ -n "$do_asv2" ] ; then -do_video_encoding asv2.avi "-qscale 10" "-an -vcodec asv2" +do_video_encoding asv2.avi "-qscale 10 -an -vcodec asv2" do_video_decoding fi if [ -n "$do_flv" ] ; then -do_video_encoding flv.flv "-qscale 10" "-an -vcodec flv" +do_video_encoding flv.flv "-qscale 10 -an -vcodec flv" do_video_decoding fi if [ -n "$do_ffv1" ] ; then -do_video_encoding ffv1.avi "-strict -2" "-an -vcodec ffv1" +do_video_encoding ffv1.avi "-strict -2 -an -vcodec ffv1" do_video_decoding fi if [ -n "$do_snow" ] ; then -do_video_encoding snow.avi "-strict -2" "-an -vcodec snow -qscale 2 -flags +qpel -me_method iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64" +do_video_encoding snow.avi "-strict -2 -an -vcodec snow -qscale 2 -flags +qpel -me_method iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64" do_video_decoding "" "-s 352x288" fi if [ -n "$do_snowll" ] ; then -do_video_encoding snow53.avi "-strict -2" "-an -vcodec snow -qscale .001 -pred 1 -flags +mv4+qpel" +do_video_encoding snow53.avi "-strict -2 -an -vcodec snow -qscale .001 -pred 1 -flags +mv4+qpel" do_video_decoding fi if [ -n "$do_dv" ] ; then -do_video_encoding dv.dv "-dct int" "-s pal -an" +do_video_encoding dv.dv "-dct int -s pal -an" do_video_decoding "" "-s cif" -do_video_encoding dv411.dv "-dct int" "-s pal -an -pix_fmt yuv411p -sws_flags area+accurate_rnd+bitexact" +do_video_encoding dv411.dv "-dct int -s pal -an -pix_fmt yuv411p -sws_flags area+accurate_rnd+bitexact" do_video_decoding "" "-s cif -sws_flags area+accurate_rnd+bitexact" fi if [ -n "$do_dv50" ] ; then -do_video_encoding dv50.dv "-dct int" "-s pal -pix_fmt yuv422p -an -sws_flags neighbor+bitexact" +do_video_encoding dv50.dv "-dct int -s pal -pix_fmt yuv422p -an -sws_flags neighbor+bitexact" do_video_decoding "" "-s cif -pix_fmt yuv420p -sws_flags neighbor+bitexact" fi if [ -n "$do_dnxhd_1080i" ] ; then # FIXME: interlaced raw DNxHD decoding is broken -do_video_encoding dnxhd-1080i.mov "" "-vcodec dnxhd -flags +ildct -s hd1080 -b 120M -pix_fmt yuv422p -vframes 5 -an" +do_video_encoding dnxhd-1080i.mov "-vcodec dnxhd -flags +ildct -s hd1080 -b 120M -pix_fmt yuv422p -vframes 5 -an" do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p" fi if [ -n "$do_dnxhd_720p" ] ; then -do_video_encoding dnxhd-720p.dnxhd "" "-s hd720 -b 90M -pix_fmt yuv422p -vframes 5 -an" +do_video_encoding dnxhd-720p.dnxhd "-s hd720 -b 90M -pix_fmt yuv422p -vframes 5 -an" do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p" fi if [ -n "$do_dnxhd_720p_rd" ] ; then -do_video_encoding dnxhd-720p-rd.dnxhd "" "-threads 4 -mbd rd -s hd720 -b 90M -pix_fmt yuv422p -vframes 5 -an" +do_video_encoding dnxhd-720p-rd.dnxhd "-threads 4 -mbd rd -s hd720 -b 90M -pix_fmt yuv422p -vframes 5 -an" do_video_decoding "-r 25" "-s cif -pix_fmt yuv420p" fi if [ -n "$do_svq1" ] ; then -do_video_encoding svq1.mov "" "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p" +do_video_encoding svq1.mov "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_flashsv" ] ; then -do_video_encoding flashsv.flv "" "-an -vcodec flashsv -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact" +do_video_encoding flashsv.flv "-an -vcodec flashsv -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact" do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" fi if [ -n "$do_flashsv2" ] ; then -do_video_encoding flashsv2.flv "" "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental" +do_video_encoding flashsv2.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental" #do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" fi if [ -n "$do_roq" ] ; then -do_video_encoding roqav.roq "" "-vframes 5" +do_video_encoding roqav.roq "-vframes 5" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_qtrle" ] ; then -do_video_encoding qtrle.mov "" "-an -vcodec qtrle" +do_video_encoding qtrle.mov "-an -vcodec qtrle" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_rgb" ] ; then -do_video_encoding rgb.avi "" "-an -vcodec rawvideo -pix_fmt bgr24" +do_video_encoding rgb.avi "-an -vcodec rawvideo -pix_fmt bgr24" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_yuv" ] ; then -do_video_encoding yuv.avi "" "-an -vcodec rawvideo -pix_fmt yuv420p" +do_video_encoding yuv.avi "-an -vcodec rawvideo -pix_fmt yuv420p" do_video_decoding "" "-pix_fmt yuv420p" fi if [ -n "$do_mp2" ] ; then -do_audio_encoding mp2.mp2 "-ar 44100" +do_audio_encoding mp2.mp2 do_audio_decoding $tiny_psnr $pcm_dst $pcm_ref 2 1924 >> $logfile fi if [ -n "$do_ac3_fixed" ] ; then -do_audio_encoding ac3.rm "" "-vn -acodec ac3_fixed" +do_audio_encoding ac3.rm "-vn -acodec ac3_fixed" # binaries configured with --disable-sse decode ac3 differently #do_audio_decoding #$tiny_psnr $pcm_dst $pcm_ref 2 1024 >> $logfile fi if [ -n "$do_g726" ] ; then -do_audio_encoding g726.wav "-ar 44100" "-ab 32k -ac 1 -ar 8000 -acodec g726" +do_audio_encoding g726.wav "-ab 32k -ac 1 -ar 8000 -acodec g726" do_audio_decoding fi if [ -n "$do_adpcm_ima_wav" ] ; then -do_audio_encoding adpcm_ima.wav "-ar 44100" "-acodec adpcm_ima_wav" +do_audio_encoding adpcm_ima.wav "-acodec adpcm_ima_wav" do_audio_decoding fi if [ -n "$do_adpcm_ima_qt" ] ; then -do_audio_encoding adpcm_qt.aiff "-ar 44100" "-acodec adpcm_ima_qt" +do_audio_encoding adpcm_qt.aiff "-acodec adpcm_ima_qt" do_audio_decoding fi if [ -n "$do_adpcm_ms" ] ; then -do_audio_encoding adpcm_ms.wav "-ar 44100" "-acodec adpcm_ms" +do_audio_encoding adpcm_ms.wav "-acodec adpcm_ms" do_audio_decoding fi if [ -n "$do_adpcm_yam" ] ; then -do_audio_encoding adpcm_yam.wav "-ar 44100" "-acodec adpcm_yamaha" +do_audio_encoding adpcm_yam.wav "-acodec adpcm_yamaha" do_audio_decoding fi if [ -n "$do_adpcm_swf" ] ; then -do_audio_encoding adpcm_swf.flv "-ar 44100" "-acodec adpcm_swf" +do_audio_encoding adpcm_swf.flv "-acodec adpcm_swf" do_audio_decoding fi if [ -n "$do_alac" ] ; then -do_audio_encoding alac.m4a "-ar 44100" "-acodec alac -compression_level 1" +do_audio_encoding alac.m4a "-acodec alac -compression_level 1" do_audio_decoding fi if [ -n "$do_flac" ] ; then -do_audio_encoding flac.flac "-ar 44100" "-acodec flac -compression_level 2" +do_audio_encoding flac.flac "-acodec flac -compression_level 2" do_audio_decoding fi if [ -n "$do_wmav1" ] ; then -do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1" +do_audio_encoding wmav1.asf "-acodec wmav1" do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile fi if [ -n "$do_wmav2" ] ; then -do_audio_encoding wmav2.asf "-ar 44100" "-acodec wmav2" +do_audio_encoding wmav2.asf "-acodec wmav2" do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav $tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile fi @@ -340,12 +340,12 @@ fi #if [ -n "$do_vorbis" ] ; then # vorbis #disabled because it is broken -#do_audio_encoding vorbis.asf "-ar 44100" "-acodec vorbis" +#do_audio_encoding vorbis.asf "-acodec vorbis" #do_audio_decoding #fi do_audio_enc_dec() { - do_audio_encoding $3.$1 "" "$4 -sample_fmt $2 -acodec $3" + do_audio_encoding $3.$1 "$4 -sample_fmt $2 -acodec $3" do_audio_decoding } diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index b14a58efcd..7339c4e3c5 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -30,8 +30,7 @@ do_image_formats() outfile="$datadir/images/$1/" mkdir -p "$outfile" file=${outfile}%02d.$1 - $echov $ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $target_path/$file - $ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $target_path/$file + run_ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact -sws_flags +accurate_rnd+bitexact $target_path/$file do_md5sum ${outfile}02.$1 >> $logfile do_ffmpeg_crc $file $3 -i $target_path/$file wc -c ${outfile}02.$1 >> $logfile @@ -169,7 +168,7 @@ do_image_formats sgi fi if [ -n "$do_jpg" ] ; then -do_image_formats jpg "-flags +bitexact -dct fastint -idct simple -pix_fmt yuvj420p" "-f image2" +do_image_formats jpg "-pix_fmt yuvj420p" "-f image2" fi if [ -n "$do_pcx" ] ; then diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 4093656736..77ede1d5b7 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -121,13 +121,13 @@ do_video_decoding() do_video_encoding() { file=${outfile}$1 - do_ffmpeg $file $2 -f image2 -vcodec pgmyuv -i $raw_src $3 + do_ffmpeg $file -f image2 -vcodec pgmyuv -i $raw_src $2 } do_audio_encoding() { file=${outfile}$1 - do_ffmpeg $file -ab 128k -ac 2 -f s16le -i $pcm_src $3 + do_ffmpeg $file -ab 128k -ac 2 -f s16le -i $pcm_src $2 } do_audio_decoding() |