fate/api-jpeg-codec-param: rename to api-mjpeg-codec-param
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Mon, 7 Dec 2015 09:40:03 +0000 (10:40 +0100)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Tue, 8 Dec 2015 19:43:20 +0000 (20:43 +0100)
tests/fate/api.mak
tests/ref/fate/api-jpeg-codec-param [deleted file]
tests/ref/fate/api-mjpeg-codec-param [new file with mode: 0644]

index 7a99710..2ebc531 100644 (file)
@@ -24,9 +24,9 @@ FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, PNG) += fate-api-png-codec-p
 fate-api-png-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
 fate-api-png-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/png1/lena-rgba.png
 
 fate-api-png-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
 fate-api-png-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/png1/lena-rgba.png
 
-FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, MJPEG) += fate-api-jpeg-codec-param
-fate-api-jpeg-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
-fate-api-jpeg-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/exif/image_small.jpg
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, MJPEG) += fate-api-mjpeg-codec-param
+fate-api-mjpeg-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
+fate-api-mjpeg-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/exif/image_small.jpg
 
 FATE_API-$(HAVE_THREADS) += fate-api-threadmessage
 fate-api-threadmessage: $(APITESTSDIR)/api-threadmessage-test$(EXESUF)
 
 FATE_API-$(HAVE_THREADS) += fate-api-threadmessage
 fate-api-threadmessage: $(APITESTSDIR)/api-threadmessage-test$(EXESUF)
diff --git a/tests/ref/fate/api-jpeg-codec-param b/tests/ref/fate/api-jpeg-codec-param
deleted file mode 100644 (file)
index 6f8da74..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-stream=0, decode=0
-    b=0
-    ab=0
-    bt=4000000
-    flags=0x00000000
-    me_method=5
-    time_base=0/1
-    g=12
-    ar=0
-    ac=0
-    cutoff=0
-    frame_size=0
-    delay=0
-    qcomp=0.500000
-    qblur=0.500000
-    qmin=2
-    qmax=31
-    qdiff=3
-    bf=0
-    b_qfactor=1.250000
-    rc_strategy=0
-    b_strategy=0
-    ps=0
-    mv_bits=0
-    header_bits=0
-    i_tex_bits=0
-    p_tex_bits=0
-    i_count=0
-    p_count=0
-    skip_count=0
-    misc_bits=0
-    frame_bits=0
-    codec_tag=0
-    bug=0x00000001
-    strict=0
-    b_qoffset=1.250000
-    err_detect=0x00000000
-    has_b_frames=0
-    block_align=0
-    mpeg_quant=0
-    qsquish=0.000000
-    rc_qmod_amp=0.000000
-    rc_qmod_freq=0
-    rc_override_count=0
-    rc_eq=
-    maxrate=0
-    minrate=0
-    bufsize=0
-    rc_buf_aggressivity=1.000000
-    i_qfactor=-0.800000
-    i_qoffset=0.000000
-    rc_init_cplx=0.000000
-    dct=0
-    lumi_mask=0.000000
-    tcplx_mask=0.000000
-    scplx_mask=0.000000
-    p_mask=0.000000
-    dark_mask=0.000000
-    idct=0
-    slice_count=0
-    ec=0x00000003
-    bits_per_coded_sample=0
-    pred=0
-    aspect=180/180
-    debug=0x00000000
-    vismv=0x00000000
-    cmp=0
-    subcmp=0
-    mbcmp=0
-    ildctcmp=8
-    dia_size=0
-    last_pred=0
-    preme=0
-    precmp=0
-    pre_dia_size=0
-    subq=8
-    dtg_active_format=0
-    me_range=0
-    ibias=999999
-    pbias=999999
-    global_quality=0
-    coder=0
-    context=0
-    slice_flags=0
-    xvmc_acceleration=0
-    mbd=0
-    stream_codec_tag=0
-    sc_threshold=0
-    lmin=0
-    lmax=0
-    nr=0
-    rc_init_occupancy=0
-    flags2=0x00000000
-    error=0
-    threads=1
-    me_threshold=0
-    mb_threshold=0
-    dc=0
-    nssew=8
-    skip_top=0
-    skip_bottom=0
-    profile=-99
-    level=-99
-    lowres=0
-    skip_threshold=0
-    skip_factor=0
-    skip_exp=0
-    skipcmp=13
-    border_mask=0.000000
-    mblmin=236
-    mblmax=3658
-    mepc=256
-    skip_loop_filter=0
-    skip_idct=0
-    skip_frame=0
-    bidir_refine=1
-    brd_scale=0
-    keyint_min=25
-    refs=1
-    chromaoffset=0
-    trellis=0
-    sc_factor=6
-    mv0_threshold=256
-    b_sensitivity=40
-    compression_level=-1
-    min_prediction_order=-1
-    max_prediction_order=-1
-    timecode_frame_start=-1
-    bits_per_raw_sample=8
-    channel_layout=0
-    request_channel_layout=0
-    rc_max_vbv_use=0.000000
-    rc_min_vbv_use=3.000000
-    ticks_per_frame=1
-    color_primaries=2
-    color_trc=2
-    colorspace=5
-    color_range=2
-    chroma_sample_location=2
-    log_level_offset=0
-    slices=0
-    thread_type=0x00000003
-    audio_service_type=0
-    request_sample_fmt=none
-    pkt_timebase=1/25
-    sub_charenc=
-    sub_charenc_mode=0x00000000
-    refcounted_frames=false
-    side_data_only_packets=true
-    skip_alpha=false
-    field_order=0
-    dump_separator=
-    codec_whitelist=
-    pixel_format=yuvj422p
-    video_size=400x225
-stream=0, decode=1
-    b=0
-    ab=0
-    bt=4000000
-    flags=0x00000000
-    me_method=5
-    time_base=0/1
-    g=12
-    ar=0
-    ac=0
-    cutoff=0
-    frame_size=0
-    delay=0
-    qcomp=0.500000
-    qblur=0.500000
-    qmin=2
-    qmax=31
-    qdiff=3
-    bf=0
-    b_qfactor=1.250000
-    rc_strategy=0
-    b_strategy=0
-    ps=0
-    mv_bits=0
-    header_bits=0
-    i_tex_bits=0
-    p_tex_bits=0
-    i_count=0
-    p_count=0
-    skip_count=0
-    misc_bits=0
-    frame_bits=0
-    codec_tag=0
-    bug=0x00000001
-    strict=0
-    b_qoffset=1.250000
-    err_detect=0x00000000
-    has_b_frames=0
-    block_align=0
-    mpeg_quant=0
-    qsquish=0.000000
-    rc_qmod_amp=0.000000
-    rc_qmod_freq=0
-    rc_override_count=0
-    rc_eq=
-    maxrate=0
-    minrate=0
-    bufsize=0
-    rc_buf_aggressivity=1.000000
-    i_qfactor=-0.800000
-    i_qoffset=0.000000
-    rc_init_cplx=0.000000
-    dct=0
-    lumi_mask=0.000000
-    tcplx_mask=0.000000
-    scplx_mask=0.000000
-    p_mask=0.000000
-    dark_mask=0.000000
-    idct=0
-    slice_count=0
-    ec=0x00000003
-    bits_per_coded_sample=0
-    pred=0
-    aspect=180/180
-    debug=0x00000000
-    vismv=0x00000000
-    cmp=0
-    subcmp=0
-    mbcmp=0
-    ildctcmp=8
-    dia_size=0
-    last_pred=0
-    preme=0
-    precmp=0
-    pre_dia_size=0
-    subq=8
-    dtg_active_format=0
-    me_range=0
-    ibias=999999
-    pbias=999999
-    global_quality=0
-    coder=0
-    context=0
-    slice_flags=0
-    xvmc_acceleration=0
-    mbd=0
-    stream_codec_tag=0
-    sc_threshold=0
-    lmin=0
-    lmax=0
-    nr=0
-    rc_init_occupancy=0
-    flags2=0x00000000
-    error=0
-    threads=1
-    me_threshold=0
-    mb_threshold=0
-    dc=0
-    nssew=8
-    skip_top=0
-    skip_bottom=0
-    profile=-99
-    level=-99
-    lowres=0
-    skip_threshold=0
-    skip_factor=0
-    skip_exp=0
-    skipcmp=13
-    border_mask=0.000000
-    mblmin=236
-    mblmax=3658
-    mepc=256
-    skip_loop_filter=0
-    skip_idct=0
-    skip_frame=0
-    bidir_refine=1
-    brd_scale=0
-    keyint_min=25
-    refs=1
-    chromaoffset=0
-    trellis=0
-    sc_factor=6
-    mv0_threshold=256
-    b_sensitivity=40
-    compression_level=-1
-    min_prediction_order=-1
-    max_prediction_order=-1
-    timecode_frame_start=-1
-    bits_per_raw_sample=8
-    channel_layout=0
-    request_channel_layout=0
-    rc_max_vbv_use=0.000000
-    rc_min_vbv_use=3.000000
-    ticks_per_frame=1
-    color_primaries=2
-    color_trc=2
-    colorspace=5
-    color_range=2
-    chroma_sample_location=2
-    log_level_offset=0
-    slices=0
-    thread_type=0x00000003
-    audio_service_type=0
-    request_sample_fmt=none
-    pkt_timebase=1/25
-    sub_charenc=
-    sub_charenc_mode=0x00000000
-    refcounted_frames=false
-    side_data_only_packets=true
-    skip_alpha=false
-    field_order=0
-    dump_separator=
-    codec_whitelist=
-    pixel_format=yuvj422p
-    video_size=400x225
diff --git a/tests/ref/fate/api-mjpeg-codec-param b/tests/ref/fate/api-mjpeg-codec-param
new file mode 100644 (file)
index 0000000..6f8da74
--- /dev/null
@@ -0,0 +1,310 @@
+stream=0, decode=0
+    b=0
+    ab=0
+    bt=4000000
+    flags=0x00000000
+    me_method=5
+    time_base=0/1
+    g=12
+    ar=0
+    ac=0
+    cutoff=0
+    frame_size=0
+    delay=0
+    qcomp=0.500000
+    qblur=0.500000
+    qmin=2
+    qmax=31
+    qdiff=3
+    bf=0
+    b_qfactor=1.250000
+    rc_strategy=0
+    b_strategy=0
+    ps=0
+    mv_bits=0
+    header_bits=0
+    i_tex_bits=0
+    p_tex_bits=0
+    i_count=0
+    p_count=0
+    skip_count=0
+    misc_bits=0
+    frame_bits=0
+    codec_tag=0
+    bug=0x00000001
+    strict=0
+    b_qoffset=1.250000
+    err_detect=0x00000000
+    has_b_frames=0
+    block_align=0
+    mpeg_quant=0
+    qsquish=0.000000
+    rc_qmod_amp=0.000000
+    rc_qmod_freq=0
+    rc_override_count=0
+    rc_eq=
+    maxrate=0
+    minrate=0
+    bufsize=0
+    rc_buf_aggressivity=1.000000
+    i_qfactor=-0.800000
+    i_qoffset=0.000000
+    rc_init_cplx=0.000000
+    dct=0
+    lumi_mask=0.000000
+    tcplx_mask=0.000000
+    scplx_mask=0.000000
+    p_mask=0.000000
+    dark_mask=0.000000
+    idct=0
+    slice_count=0
+    ec=0x00000003
+    bits_per_coded_sample=0
+    pred=0
+    aspect=180/180
+    debug=0x00000000
+    vismv=0x00000000
+    cmp=0
+    subcmp=0
+    mbcmp=0
+    ildctcmp=8
+    dia_size=0
+    last_pred=0
+    preme=0
+    precmp=0
+    pre_dia_size=0
+    subq=8
+    dtg_active_format=0
+    me_range=0
+    ibias=999999
+    pbias=999999
+    global_quality=0
+    coder=0
+    context=0
+    slice_flags=0
+    xvmc_acceleration=0
+    mbd=0
+    stream_codec_tag=0
+    sc_threshold=0
+    lmin=0
+    lmax=0
+    nr=0
+    rc_init_occupancy=0
+    flags2=0x00000000
+    error=0
+    threads=1
+    me_threshold=0
+    mb_threshold=0
+    dc=0
+    nssew=8
+    skip_top=0
+    skip_bottom=0
+    profile=-99
+    level=-99
+    lowres=0
+    skip_threshold=0
+    skip_factor=0
+    skip_exp=0
+    skipcmp=13
+    border_mask=0.000000
+    mblmin=236
+    mblmax=3658
+    mepc=256
+    skip_loop_filter=0
+    skip_idct=0
+    skip_frame=0
+    bidir_refine=1
+    brd_scale=0
+    keyint_min=25
+    refs=1
+    chromaoffset=0
+    trellis=0
+    sc_factor=6
+    mv0_threshold=256
+    b_sensitivity=40
+    compression_level=-1
+    min_prediction_order=-1
+    max_prediction_order=-1
+    timecode_frame_start=-1
+    bits_per_raw_sample=8
+    channel_layout=0
+    request_channel_layout=0
+    rc_max_vbv_use=0.000000
+    rc_min_vbv_use=3.000000
+    ticks_per_frame=1
+    color_primaries=2
+    color_trc=2
+    colorspace=5
+    color_range=2
+    chroma_sample_location=2
+    log_level_offset=0
+    slices=0
+    thread_type=0x00000003
+    audio_service_type=0
+    request_sample_fmt=none
+    pkt_timebase=1/25
+    sub_charenc=
+    sub_charenc_mode=0x00000000
+    refcounted_frames=false
+    side_data_only_packets=true
+    skip_alpha=false
+    field_order=0
+    dump_separator=
+    codec_whitelist=
+    pixel_format=yuvj422p
+    video_size=400x225
+stream=0, decode=1
+    b=0
+    ab=0
+    bt=4000000
+    flags=0x00000000
+    me_method=5
+    time_base=0/1
+    g=12
+    ar=0
+    ac=0
+    cutoff=0
+    frame_size=0
+    delay=0
+    qcomp=0.500000
+    qblur=0.500000
+    qmin=2
+    qmax=31
+    qdiff=3
+    bf=0
+    b_qfactor=1.250000
+    rc_strategy=0
+    b_strategy=0
+    ps=0
+    mv_bits=0
+    header_bits=0
+    i_tex_bits=0
+    p_tex_bits=0
+    i_count=0
+    p_count=0
+    skip_count=0
+    misc_bits=0
+    frame_bits=0
+    codec_tag=0
+    bug=0x00000001
+    strict=0
+    b_qoffset=1.250000
+    err_detect=0x00000000
+    has_b_frames=0
+    block_align=0
+    mpeg_quant=0
+    qsquish=0.000000
+    rc_qmod_amp=0.000000
+    rc_qmod_freq=0
+    rc_override_count=0
+    rc_eq=
+    maxrate=0
+    minrate=0
+    bufsize=0
+    rc_buf_aggressivity=1.000000
+    i_qfactor=-0.800000
+    i_qoffset=0.000000
+    rc_init_cplx=0.000000
+    dct=0
+    lumi_mask=0.000000
+    tcplx_mask=0.000000
+    scplx_mask=0.000000
+    p_mask=0.000000
+    dark_mask=0.000000
+    idct=0
+    slice_count=0
+    ec=0x00000003
+    bits_per_coded_sample=0
+    pred=0
+    aspect=180/180
+    debug=0x00000000
+    vismv=0x00000000
+    cmp=0
+    subcmp=0
+    mbcmp=0
+    ildctcmp=8
+    dia_size=0
+    last_pred=0
+    preme=0
+    precmp=0
+    pre_dia_size=0
+    subq=8
+    dtg_active_format=0
+    me_range=0
+    ibias=999999
+    pbias=999999
+    global_quality=0
+    coder=0
+    context=0
+    slice_flags=0
+    xvmc_acceleration=0
+    mbd=0
+    stream_codec_tag=0
+    sc_threshold=0
+    lmin=0
+    lmax=0
+    nr=0
+    rc_init_occupancy=0
+    flags2=0x00000000
+    error=0
+    threads=1
+    me_threshold=0
+    mb_threshold=0
+    dc=0
+    nssew=8
+    skip_top=0
+    skip_bottom=0
+    profile=-99
+    level=-99
+    lowres=0
+    skip_threshold=0
+    skip_factor=0
+    skip_exp=0
+    skipcmp=13
+    border_mask=0.000000
+    mblmin=236
+    mblmax=3658
+    mepc=256
+    skip_loop_filter=0
+    skip_idct=0
+    skip_frame=0
+    bidir_refine=1
+    brd_scale=0
+    keyint_min=25
+    refs=1
+    chromaoffset=0
+    trellis=0
+    sc_factor=6
+    mv0_threshold=256
+    b_sensitivity=40
+    compression_level=-1
+    min_prediction_order=-1
+    max_prediction_order=-1
+    timecode_frame_start=-1
+    bits_per_raw_sample=8
+    channel_layout=0
+    request_channel_layout=0
+    rc_max_vbv_use=0.000000
+    rc_min_vbv_use=3.000000
+    ticks_per_frame=1
+    color_primaries=2
+    color_trc=2
+    colorspace=5
+    color_range=2
+    chroma_sample_location=2
+    log_level_offset=0
+    slices=0
+    thread_type=0x00000003
+    audio_service_type=0
+    request_sample_fmt=none
+    pkt_timebase=1/25
+    sub_charenc=
+    sub_charenc_mode=0x00000000
+    refcounted_frames=false
+    side_data_only_packets=true
+    skip_alpha=false
+    field_order=0
+    dump_separator=
+    codec_whitelist=
+    pixel_format=yuvj422p
+    video_size=400x225