April 2014 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/ff_init_vlc_sparse: use a spinlock for thread sync
by git＠videolan.org 17 Jun '14

17 Jun '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jul 13 13:32:39 2013 +0200| [6af8326354ed6c1c68b53b3f2bba6697fb2d3bff] | committer: Michael Niedermayer avcodec/ff_init_vlc_sparse: use a spinlock for thread sync Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6af8326354ed6c1c6… --- libavcodec/bitstream.c | 28 +++++++++++++++++++--------- libavcodec/get_bits.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 3c4d176..aac32a5 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -28,6 +28,7 @@ * bitstream api. */ +#include "libavutil/atomic.h" #include "libavutil/avassert.h" #include "avcodec.h" #include "mathops.h" @@ -269,14 +270,17 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, { VLCcode *buf; int i, j, ret; + void *state; vlc->bits = nb_bits; if (flags & INIT_VLC_USE_NEW_STATIC) { - if (vlc->table_size && vlc->table_size == vlc->table_allocated) { - return 0; - } else if(vlc->table_size) { - abort(); // fatal error, we are called on a partially initialized table + while (state = avpriv_atomic_ptr_cas(&vlc->init_state, NULL, vlc)) { + if (state == vlc + 1) { + av_assert0(vlc->table_size && vlc->table_size == vlc->table_allocated); + return 0; + } } + av_assert0(!vlc->table_size); } else { vlc->table = NULL; vlc->table_allocated = 0; @@ -326,12 +330,18 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, ret = build_table(vlc, nb_bits, nb_codes, buf, flags); av_free(buf); - if (ret < 0) { - av_freep(&vlc->table); - return ret; + if (flags & INIT_VLC_USE_NEW_STATIC) { + if(vlc->table_size != vlc->table_allocated) + av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); + state = avpriv_atomic_ptr_cas(&vlc->init_state, vlc, vlc+1); + av_assert0(state == vlc); + av_assert0(ret >= 0); + } else { + if (ret < 0) { + av_freep(&vlc->table); + return ret; + } } - if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated) - av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); return 0; } diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index b6cc75a..3967b49 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -64,6 +64,7 @@ typedef struct VLC { int bits; VLC_TYPE (*table)[2]; ///< code, bits int table_size, table_allocated; + void *init_state; } VLC; typedef struct RL_VLC_ELEM {

4 5

Move av_find_best_pix_fmt_of_2() from avcodec to avutil
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Apr 26 18:22:12 2014 +0200| [617e866e25b72fa5d9f9d6bbcbd7e4bd69e63a54] | committer: Michael Niedermayer Move av_find_best_pix_fmt_of_2() from avcodec to avutil This avoids a dependancy of libavfilter on libavcodec See Ticket 3592 Fixes Ticket2784 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=617e866e25b72fa5d… --- libavcodec/avcodec.h | 55 +---------- libavcodec/imgconvert.c | 188 +----------------------------------- libavfilter/avfiltergraph.c | 3 +- libavutil/Makefile | 1 + libavutil/pixdesc.c | 223 +++++++++++++++++++++++++++++++++++++++++++ libavutil/pixdesc.h | 50 +++++++++- 6 files changed, 280 insertions(+), 240 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1d42bbe..d3ad82e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4690,30 +4690,8 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int */ unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt); -#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */ -#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */ -#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */ -#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */ -#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */ -#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */ - -/** - * Compute what kind of losses will occur when converting from one specific - * pixel format to another. - * When converting from one pixel format to another, information loss may occur. - * For example, when converting from RGB24 to GRAY, the color information will - * be lost. Similarly, other losses occur when converting from some formats to - * other formats. These losses can involve loss of chroma, but also loss of - * resolution, loss of color depth, loss due to the color space conversion, loss - * of the alpha bits or loss due to color quantization. - * avcodec_get_fix_fmt_loss() informs you about the various types of losses - * which will occur when converting from one pixel format to another. - * - * @param[in] dst_pix_fmt destination pixel format - * @param[in] src_pix_fmt source pixel format - * @param[in] has_alpha Whether the source pixel format alpha channel is used. - * @return Combination of flags informing you what kind of losses will occur - * (maximum loss for an invalid dst_pix_fmt). +/** + * @deprecated see av_get_pix_fmt_loss() */ int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, int has_alpha); @@ -4740,34 +4718,7 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p int has_alpha, int *loss_ptr); /** - * Find the best pixel format to convert to given a certain source pixel - * format and a selection of two destination pixel formats. When converting from - * one pixel format to another, information loss may occur. For example, when converting - * from RGB24 to GRAY, the color information will be lost. Similarly, other losses occur when - * converting from some formats to other formats. avcodec_find_best_pix_fmt_of_2() selects which of - * the given pixel formats should be used to suffer the least amount of loss. - * - * If one of the destination formats is AV_PIX_FMT_NONE the other pixel format (if valid) will be - * returned. - * - * @code - * src_pix_fmt = AV_PIX_FMT_YUV420P; - * dst_pix_fmt1= AV_PIX_FMT_RGB24; - * dst_pix_fmt2= AV_PIX_FMT_GRAY8; - * dst_pix_fmt3= AV_PIX_FMT_RGB8; - * loss= FF_LOSS_CHROMA; // don't care about chroma loss, so chroma loss will be ignored. - * dst_pix_fmt = avcodec_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, alpha, &loss); - * dst_pix_fmt = avcodec_find_best_pix_fmt_of_2(dst_pix_fmt, dst_pix_fmt3, src_pix_fmt, alpha, &loss); - * @endcode - * - * @param[in] dst_pix_fmt1 One of the two destination pixel formats to choose from - * @param[in] dst_pix_fmt2 The other of the two destination pixel formats to choose from - * @param[in] src_pix_fmt Source pixel format - * @param[in] has_alpha Whether the source pixel format alpha channel is used. - * @param[in, out] loss_ptr Combination of loss flags. In: selects which of the losses to ignore, i.e. - * NULL or value of zero means we care about all losses. Out: the loss - * that occurs when converting from src to selected dst pixel format. - * @return The best pixel format to convert to or -1 if none was found. + * @deprecated see av_find_best_pix_fmt_of_2() */ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index cabd3fd..27c984a 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -40,12 +40,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" -#define FF_COLOR_NA -1 -#define FF_COLOR_RGB 0 /**< RGB color space */ -#define FF_COLOR_GRAY 1 /**< gray color space */ -#define FF_COLOR_YUV 2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */ -#define FF_COLOR_YUV_JPEG 3 /**< YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */ - #if HAVE_MMX_EXTERNAL #define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx #define deinterlace_line ff_deinterlace_line_mmx @@ -54,10 +48,6 @@ #define deinterlace_line deinterlace_line_c #endif -#define pixdesc_has_alpha(pixdesc) \ - ((pixdesc)->nb_components == 2 || (pixdesc)->nb_components == 4 || (pixdesc)->flags & AV_PIX_FMT_FLAG_PAL) - - void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); @@ -66,189 +56,17 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift = desc->log2_chroma_h; } -static int get_color_type(const AVPixFmtDescriptor *desc) { - if (desc->flags & AV_PIX_FMT_FLAG_PAL) - return FF_COLOR_RGB; - - if(desc->nb_components == 1 || desc->nb_components == 2) - return FF_COLOR_GRAY; - - if(desc->name && !strncmp(desc->name, "yuvj", 4)) - return FF_COLOR_YUV_JPEG; - - if(desc->flags & AV_PIX_FMT_FLAG_RGB) - return FF_COLOR_RGB; - - if(desc->nb_components == 0) - return FF_COLOR_NA; - - return FF_COLOR_YUV; -} - -static int get_pix_fmt_depth(int *min, int *max, enum AVPixelFormat pix_fmt) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); - int i; - - if (!desc || !desc->nb_components) { - *min = *max = 0; - return AVERROR(EINVAL); - } - - *min = INT_MAX, *max = -INT_MAX; - for (i = 0; i < desc->nb_components; i++) { - *min = FFMIN(desc->comp[i].depth_minus1+1, *min); - *max = FFMAX(desc->comp[i].depth_minus1+1, *max); - } - return 0; -} - -static int get_pix_fmt_score(enum AVPixelFormat dst_pix_fmt, - enum AVPixelFormat src_pix_fmt, - unsigned *lossp, unsigned consider) -{ - const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(src_pix_fmt); - const AVPixFmtDescriptor *dst_desc = av_pix_fmt_desc_get(dst_pix_fmt); - int src_color, dst_color; - int src_min_depth, src_max_depth, dst_min_depth, dst_max_depth; - int ret, loss, i, nb_components; - int score = INT_MAX - 1; - - if (dst_pix_fmt >= AV_PIX_FMT_NB || dst_pix_fmt <= AV_PIX_FMT_NONE) - return ~0; - - /* compute loss */ - *lossp = loss = 0; - - if (dst_pix_fmt == src_pix_fmt) - return INT_MAX; - - if ((ret = get_pix_fmt_depth(&src_min_depth, &src_max_depth, src_pix_fmt)) < 0) - return ret; - if ((ret = get_pix_fmt_depth(&dst_min_depth, &dst_max_depth, dst_pix_fmt)) < 0) - return ret; - - src_color = get_color_type(src_desc); - dst_color = get_color_type(dst_desc); - if (dst_pix_fmt == AV_PIX_FMT_PAL8) - nb_components = FFMIN(src_desc->nb_components, 4); - else - nb_components = FFMIN(src_desc->nb_components, dst_desc->nb_components); - - for (i = 0; i < nb_components; i++) { - int depth_minus1 = (dst_pix_fmt == AV_PIX_FMT_PAL8) ? 7/nb_components : dst_desc->comp[i].depth_minus1; - if (src_desc->comp[i].depth_minus1 > depth_minus1 && (consider & FF_LOSS_DEPTH)) { - loss |= FF_LOSS_DEPTH; - score -= 65536 >> depth_minus1; - } - } - - if (consider & FF_LOSS_RESOLUTION) { - if (dst_desc->log2_chroma_w > src_desc->log2_chroma_w) { - loss |= FF_LOSS_RESOLUTION; - score -= 256 << dst_desc->log2_chroma_w; - } - if (dst_desc->log2_chroma_h > src_desc->log2_chroma_h) { - loss |= FF_LOSS_RESOLUTION; - score -= 256 << dst_desc->log2_chroma_h; - } - // don't favor 422 over 420 if downsampling is needed, because 420 has much better support on the decoder side - if (dst_desc->log2_chroma_w == 1 && src_desc->log2_chroma_w == 0 && - dst_desc->log2_chroma_h == 1 && src_desc->log2_chroma_h == 0 ) { - score += 512; - } - } - - if(consider & FF_LOSS_COLORSPACE) - switch(dst_color) { - case FF_COLOR_RGB: - if (src_color != FF_COLOR_RGB && - src_color != FF_COLOR_GRAY) - loss |= FF_LOSS_COLORSPACE; - break; - case FF_COLOR_GRAY: - if (src_color != FF_COLOR_GRAY) - loss |= FF_LOSS_COLORSPACE; - break; - case FF_COLOR_YUV: - if (src_color != FF_COLOR_YUV) - loss |= FF_LOSS_COLORSPACE; - break; - case FF_COLOR_YUV_JPEG: - if (src_color != FF_COLOR_YUV_JPEG && - src_color != FF_COLOR_YUV && - src_color != FF_COLOR_GRAY) - loss |= FF_LOSS_COLORSPACE; - break; - default: - /* fail safe test */ - if (src_color != dst_color) - loss |= FF_LOSS_COLORSPACE; - break; - } - if(loss & FF_LOSS_COLORSPACE) - score -= (nb_components * 65536) >> FFMIN(dst_desc->comp[0].depth_minus1, src_desc->comp[0].depth_minus1); - - if (dst_color == FF_COLOR_GRAY && - src_color != FF_COLOR_GRAY && (consider & FF_LOSS_CHROMA)) { - loss |= FF_LOSS_CHROMA; - score -= 2 * 65536; - } - if (!pixdesc_has_alpha(dst_desc) && (pixdesc_has_alpha(src_desc) && (consider & FF_LOSS_ALPHA))) { - loss |= FF_LOSS_ALPHA; - score -= 65536; - } - if (dst_pix_fmt == AV_PIX_FMT_PAL8 && (consider & FF_LOSS_COLORQUANT) && - (src_pix_fmt != AV_PIX_FMT_PAL8 && (src_color != FF_COLOR_GRAY || (pixdesc_has_alpha(src_desc) && (consider & FF_LOSS_ALPHA))))) { - loss |= FF_LOSS_COLORQUANT; - score -= 65536; - } - - *lossp = loss; - return score; -} - int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, int has_alpha) { - int loss; - int ret = get_pix_fmt_score(dst_pix_fmt, src_pix_fmt, &loss, has_alpha ? ~0 : ~FF_LOSS_ALPHA); - if (ret < 0) - return ret; - return loss; + return av_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); } enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) { - enum AVPixelFormat dst_pix_fmt; - int loss1, loss2, loss_mask; - const AVPixFmtDescriptor *desc1 = av_pix_fmt_desc_get(dst_pix_fmt1); - const AVPixFmtDescriptor *desc2 = av_pix_fmt_desc_get(dst_pix_fmt2); - int score1, score2; - - loss_mask= loss_ptr?~*loss_ptr:~0; /* use loss mask if provided */ - if(!has_alpha) - loss_mask &= ~FF_LOSS_ALPHA; - - dst_pix_fmt = AV_PIX_FMT_NONE; - score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, &loss1, loss_mask); - score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, &loss2, loss_mask); - - if (score1 == score2) { - if(av_get_padded_bits_per_pixel(desc2) != av_get_padded_bits_per_pixel(desc1)) { - dst_pix_fmt = av_get_padded_bits_per_pixel(desc2) < av_get_padded_bits_per_pixel(desc1) ? dst_pix_fmt2 : dst_pix_fmt1; - } else { - dst_pix_fmt = desc2->nb_components < desc1->nb_components ? dst_pix_fmt2 : dst_pix_fmt1; - } - } else { - dst_pix_fmt = score1 < score2 ? dst_pix_fmt2 : dst_pix_fmt1; - } - - if (loss_ptr) - *loss_ptr = avcodec_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); - return dst_pix_fmt; + return av_find_best_pix_fmt_of_2(dst_pix_fmt1, dst_pix_fmt2, src_pix_fmt, has_alpha, loss_ptr); } #if AV_HAVE_INCOMPATIBLE_LIBAV_ABI @@ -657,7 +475,7 @@ int main(void){ av_log(NULL, AV_LOG_INFO, "%3d unused pixel format values\n", skip); skip = 0; } - av_log(NULL, AV_LOG_INFO, "pix fmt %s yuv_plan:%d avg_bpp:%d colortype:%d\n", desc->name, is_yuv_planar(desc), av_get_padded_bits_per_pixel(desc), get_color_type(desc)); + av_log(NULL, AV_LOG_INFO, "pix fmt %s yuv_plan:%d avg_bpp:%d\n", desc->name, is_yuv_planar(desc), av_get_padded_bits_per_pixel(desc)); if ((!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) != (desc->nb_components != 2 && desc->nb_components != 4)) { av_log(NULL, AV_LOG_ERROR, "Alpha flag mismatch\n"); err = 1; diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index cfa4a44..47b5b72 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -31,7 +31,6 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavcodec/avcodec.h" // avcodec_find_best_pix_fmt_of_2() #include "avfilter.h" #include "formats.h" @@ -628,7 +627,7 @@ static int pick_format(AVFilterLink *link, AVFilterLink *ref) int i; for (i=0; i<link->in_formats->nb_formats; i++) { enum AVPixelFormat p = link->in_formats->formats[i]; - best= avcodec_find_best_pix_fmt_of_2(best, p, ref->format, has_alpha, NULL); + best= av_find_best_pix_fmt_of_2(best, p, ref->format, has_alpha, NULL); } av_log(link->src,AV_LOG_DEBUG, "picking %s out of %d ref:%s alpha:%d\n", av_get_pix_fmt_name(best), link->in_formats->nb_formats, diff --git a/libavutil/Makefile b/libavutil/Makefile index d2ebebc..a345024 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -164,6 +164,7 @@ TESTPROGS = adler32 \ opt \ pca \ parseutils \ + pixdesc \ random_seed \ rational \ ripemd \ diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 036481a..6b1b05f 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2082,3 +2082,226 @@ enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt) return get_pix_fmt_internal(name); } + +#define FF_COLOR_NA -1 +#define FF_COLOR_RGB 0 /**< RGB color space */ +#define FF_COLOR_GRAY 1 /**< gray color space */ +#define FF_COLOR_YUV 2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */ +#define FF_COLOR_YUV_JPEG 3 /**< YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */ + +#define pixdesc_has_alpha(pixdesc) \ + ((pixdesc)->nb_components == 2 || (pixdesc)->nb_components == 4 || (pixdesc)->flags & AV_PIX_FMT_FLAG_PAL) + + +static int get_color_type(const AVPixFmtDescriptor *desc) { + if (desc->flags & AV_PIX_FMT_FLAG_PAL) + return FF_COLOR_RGB; + + if(desc->nb_components == 1 || desc->nb_components == 2) + return FF_COLOR_GRAY; + + if(desc->name && !strncmp(desc->name, "yuvj", 4)) + return FF_COLOR_YUV_JPEG; + + if(desc->flags & AV_PIX_FMT_FLAG_RGB) + return FF_COLOR_RGB; + + if(desc->nb_components == 0) + return FF_COLOR_NA; + + return FF_COLOR_YUV; +} + +static int get_pix_fmt_depth(int *min, int *max, enum AVPixelFormat pix_fmt) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); + int i; + + if (!desc || !desc->nb_components) { + *min = *max = 0; + return AVERROR(EINVAL); + } + + *min = INT_MAX, *max = -INT_MAX; + for (i = 0; i < desc->nb_components; i++) { + *min = FFMIN(desc->comp[i].depth_minus1+1, *min); + *max = FFMAX(desc->comp[i].depth_minus1+1, *max); + } + return 0; +} + +static int get_pix_fmt_score(enum AVPixelFormat dst_pix_fmt, + enum AVPixelFormat src_pix_fmt, + unsigned *lossp, unsigned consider) +{ + const AVPixFmtDescriptor *src_desc = av_pix_fmt_desc_get(src_pix_fmt); + const AVPixFmtDescriptor *dst_desc = av_pix_fmt_desc_get(dst_pix_fmt); + int src_color, dst_color; + int src_min_depth, src_max_depth, dst_min_depth, dst_max_depth; + int ret, loss, i, nb_components; + int score = INT_MAX - 1; + + if (dst_pix_fmt >= AV_PIX_FMT_NB || dst_pix_fmt <= AV_PIX_FMT_NONE) + return ~0; + + /* compute loss */ + *lossp = loss = 0; + + if (dst_pix_fmt == src_pix_fmt) + return INT_MAX; + + if ((ret = get_pix_fmt_depth(&src_min_depth, &src_max_depth, src_pix_fmt)) < 0) + return ret; + if ((ret = get_pix_fmt_depth(&dst_min_depth, &dst_max_depth, dst_pix_fmt)) < 0) + return ret; + + src_color = get_color_type(src_desc); + dst_color = get_color_type(dst_desc); + if (dst_pix_fmt == AV_PIX_FMT_PAL8) + nb_components = FFMIN(src_desc->nb_components, 4); + else + nb_components = FFMIN(src_desc->nb_components, dst_desc->nb_components); + + for (i = 0; i < nb_components; i++) { + int depth_minus1 = (dst_pix_fmt == AV_PIX_FMT_PAL8) ? 7/nb_components : dst_desc->comp[i].depth_minus1; + if (src_desc->comp[i].depth_minus1 > depth_minus1 && (consider & FF_LOSS_DEPTH)) { + loss |= FF_LOSS_DEPTH; + score -= 65536 >> depth_minus1; + } + } + + if (consider & FF_LOSS_RESOLUTION) { + if (dst_desc->log2_chroma_w > src_desc->log2_chroma_w) { + loss |= FF_LOSS_RESOLUTION; + score -= 256 << dst_desc->log2_chroma_w; + } + if (dst_desc->log2_chroma_h > src_desc->log2_chroma_h) { + loss |= FF_LOSS_RESOLUTION; + score -= 256 << dst_desc->log2_chroma_h; + } + // don't favor 422 over 420 if downsampling is needed, because 420 has much better support on the decoder side + if (dst_desc->log2_chroma_w == 1 && src_desc->log2_chroma_w == 0 && + dst_desc->log2_chroma_h == 1 && src_desc->log2_chroma_h == 0 ) { + score += 512; + } + } + + if(consider & FF_LOSS_COLORSPACE) + switch(dst_color) { + case FF_COLOR_RGB: + if (src_color != FF_COLOR_RGB && + src_color != FF_COLOR_GRAY) + loss |= FF_LOSS_COLORSPACE; + break; + case FF_COLOR_GRAY: + if (src_color != FF_COLOR_GRAY) + loss |= FF_LOSS_COLORSPACE; + break; + case FF_COLOR_YUV: + if (src_color != FF_COLOR_YUV) + loss |= FF_LOSS_COLORSPACE; + break; + case FF_COLOR_YUV_JPEG: + if (src_color != FF_COLOR_YUV_JPEG && + src_color != FF_COLOR_YUV && + src_color != FF_COLOR_GRAY) + loss |= FF_LOSS_COLORSPACE; + break; + default: + /* fail safe test */ + if (src_color != dst_color) + loss |= FF_LOSS_COLORSPACE; + break; + } + if(loss & FF_LOSS_COLORSPACE) + score -= (nb_components * 65536) >> FFMIN(dst_desc->comp[0].depth_minus1, src_desc->comp[0].depth_minus1); + + if (dst_color == FF_COLOR_GRAY && + src_color != FF_COLOR_GRAY && (consider & FF_LOSS_CHROMA)) { + loss |= FF_LOSS_CHROMA; + score -= 2 * 65536; + } + if (!pixdesc_has_alpha(dst_desc) && (pixdesc_has_alpha(src_desc) && (consider & FF_LOSS_ALPHA))) { + loss |= FF_LOSS_ALPHA; + score -= 65536; + } + if (dst_pix_fmt == AV_PIX_FMT_PAL8 && (consider & FF_LOSS_COLORQUANT) && + (src_pix_fmt != AV_PIX_FMT_PAL8 && (src_color != FF_COLOR_GRAY || (pixdesc_has_alpha(src_desc) && (consider & FF_LOSS_ALPHA))))) { + loss |= FF_LOSS_COLORQUANT; + score -= 65536; + } + + *lossp = loss; + return score; +} + +int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, + enum AVPixelFormat src_pix_fmt, + int has_alpha) +{ + int loss; + int ret = get_pix_fmt_score(dst_pix_fmt, src_pix_fmt, &loss, has_alpha ? ~0 : ~FF_LOSS_ALPHA); + if (ret < 0) + return ret; + return loss; +} + +enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, + enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) +{ + enum AVPixelFormat dst_pix_fmt; + int loss1, loss2, loss_mask; + const AVPixFmtDescriptor *desc1 = av_pix_fmt_desc_get(dst_pix_fmt1); + const AVPixFmtDescriptor *desc2 = av_pix_fmt_desc_get(dst_pix_fmt2); + int score1, score2; + + loss_mask= loss_ptr?~*loss_ptr:~0; /* use loss mask if provided */ + if(!has_alpha) + loss_mask &= ~FF_LOSS_ALPHA; + + dst_pix_fmt = AV_PIX_FMT_NONE; + score1 = get_pix_fmt_score(dst_pix_fmt1, src_pix_fmt, &loss1, loss_mask); + score2 = get_pix_fmt_score(dst_pix_fmt2, src_pix_fmt, &loss2, loss_mask); + + if (score1 == score2) { + if(av_get_padded_bits_per_pixel(desc2) != av_get_padded_bits_per_pixel(desc1)) { + dst_pix_fmt = av_get_padded_bits_per_pixel(desc2) < av_get_padded_bits_per_pixel(desc1) ? dst_pix_fmt2 : dst_pix_fmt1; + } else { + dst_pix_fmt = desc2->nb_components < desc1->nb_components ? dst_pix_fmt2 : dst_pix_fmt1; + } + } else { + dst_pix_fmt = score1 < score2 ? dst_pix_fmt2 : dst_pix_fmt1; + } + + if (loss_ptr) + *loss_ptr = av_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); + return dst_pix_fmt; +} + +#ifdef TEST + +int main(void){ + int i; + int err=0; + int skip = 0; + + for (i=0; i<AV_PIX_FMT_NB*2; i++) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i); + if(!desc || !desc->name) { + skip ++; + continue; + } + if (skip) { + av_log(NULL, AV_LOG_INFO, "%3d unused pixel format values\n", skip); + skip = 0; + } + av_log(NULL, AV_LOG_INFO, "pix fmt %s avg_bpp:%d colortype:%d\n", desc->name, av_get_padded_bits_per_pixel(desc), get_color_type(desc)); + if ((!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) != (desc->nb_components != 2 && desc->nb_components != 4)) { + av_log(NULL, AV_LOG_ERROR, "Alpha flag mismatch\n"); + err = 1; + } + } + return err; +} + +#endif diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index e88bf9b..1d2ead6 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -255,7 +255,7 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc); * Utility function to access log2_chroma_w log2_chroma_h from * the pixel format AVPixFmtDescriptor. * - * See avcodec_get_chroma_sub_sample() for a function that asserts a + * See av_get_chroma_sub_sample() for a function that asserts a * valid pixel format instead of returning an error code. * Its recommanded that you use avcodec_get_chroma_sub_sample unless * you do check the return code! @@ -287,5 +287,53 @@ void ff_check_pixfmt_descriptors(void); */ enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt); +#define FF_LOSS_RESOLUTION 0x0001 /**< loss due to resolution change */ +#define FF_LOSS_DEPTH 0x0002 /**< loss due to color depth change */ +#define FF_LOSS_COLORSPACE 0x0004 /**< loss due to color space conversion */ +#define FF_LOSS_ALPHA 0x0008 /**< loss of alpha bits */ +#define FF_LOSS_COLORQUANT 0x0010 /**< loss due to color quantization */ +#define FF_LOSS_CHROMA 0x0020 /**< loss of chroma (e.g. RGB to gray conversion) */ +/** + * Compute what kind of losses will occur when converting from one specific + * pixel format to another. + * When converting from one pixel format to another, information loss may occur. + * For example, when converting from RGB24 to GRAY, the color information will + * be lost. Similarly, other losses occur when converting from some formats to + * other formats. These losses can involve loss of chroma, but also loss of + * resolution, loss of color depth, loss due to the color space conversion, loss + * of the alpha bits or loss due to color quantization. + * av_get_fix_fmt_loss() informs you about the various types of losses + * which will occur when converting from one pixel format to another. + * + * @param[in] dst_pix_fmt destination pixel format + * @param[in] src_pix_fmt source pixel format + * @param[in] has_alpha Whether the source pixel format alpha channel is used. + * @return Combination of flags informing you what kind of losses will occur + * (maximum loss for an invalid dst_pix_fmt). + */ +int av_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, + enum AVPixelFormat src_pix_fmt, + int has_alpha); + +/** + * Compute what kind of losses will occur when converting from one specific + * pixel format to another. + * When converting from one pixel format to another, information loss may occur. + * For example, when converting from RGB24 to GRAY, the color information will + * be lost. Similarly, other losses occur when converting from some formats to + * other formats. These losses can involve loss of chroma, but also loss of + * resolution, loss of color depth, loss due to the color space conversion, loss + * of the alpha bits or loss due to color quantization. + * av_get_fix_fmt_loss() informs you about the various types of losses + * which will occur when converting from one pixel format to another. + * + * @param[in] dst_pix_fmt destination pixel format + * @param[in] src_pix_fmt source pixel format + * @param[in] has_alpha Whether the source pixel format alpha channel is used. + * @return Combination of flags informing you what kind of losses will occur + * (maximum loss for an invalid dst_pix_fmt). + */ +enum AVPixelFormat av_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, + enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); #endif /* AVUTIL_PIXDESC_H */

1 0

lavd/opengl_enc: fix pixel data alignment
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2(a)gmail.com> | Wed Apr 30 20:49:52 2014 +0200| [8ff72924cfeb3c8fa8fc57cfea3f78ca0caaec0f] | committer: Michael Niedermayer lavd/opengl_enc: fix pixel data alignment Signed-off-by: Lukasz Marek <lukasz.m.luki2(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ff72924cfeb3c8fa… --- libavdevice/opengl_enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 4e25f19..5f9748d 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -1204,6 +1204,8 @@ static int opengl_draw(AVFormatContext *h, void *input, int repaint, int is_pkt) glClear(GL_COLOR_BUFFER_BIT); if (!repaint) { + if (is_pkt) + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); LOAD_TEXTURE_DATA(0, 0) if (desc->flags & AV_PIX_FMT_FLAG_PLANAR) { LOAD_TEXTURE_DATA(1, 1)

1 0

fate/hevc: update with new sequences from jctvc( cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb)
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Mickaël Raulet <mraulet(a)insa-rennes.fr> | Tue Apr 29 22:35:29 2014 +0200| [bd4dc9e71775815b8c2aa789967cd971c324a2e1] | committer: Michael Niedermayer fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd4dc9e71775815b8… --- tests/fate/hevc.mak | 40 +- ...IXS_2 => hevc-conformance-DBLK_A_MAIN10_VIXS_3} | 0 tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1 | 9 - tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1 | 9 - tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1 | 9 - tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1 | 9 - tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 | 97 ++++ tests/ref/fate/hevc-conformance-ENTP_A_LG_2 | 51 -- tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1 | 25 + tests/ref/fate/hevc-conformance-ENTP_B_LG_2 | 51 -- tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1 | 25 + tests/ref/fate/hevc-conformance-ENTP_C_LG_3 | 51 -- tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1 | 25 + tests/ref/fate/hevc-conformance-FILLER_A_Sony_1 | 61 +++ tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2 | 97 ++++ tests/ref/fate/hevc-conformance-INITQP_A_Sony_1 | 61 +++ tests/ref/fate/hevc-conformance-INITQP_B_Sony_1 | 91 ++++ .../ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2 | 5 - .../ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3 | 5 + .../fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 | 41 ++ .../fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 | 48 ++ .../ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1 | 501 ++++++++++++++++++++ .../ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 | 99 ++++ .../ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 | 97 ++++ 24 files changed, 1299 insertions(+), 208 deletions(-) diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 0727882..2c746d8 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -1,12 +1,12 @@ HEVC_SAMPLES = \ AMP_A_Samsung_4 \ AMP_B_Samsung_4 \ - AMVP_C_Samsung_4 \ AMP_D_Hisilicon \ AMP_E_Hisilicon \ AMP_F_Hisilicon_3 \ AMVP_A_MTK_4 \ AMVP_B_MTK_4 \ + AMVP_C_Samsung_4 \ CAINIT_A_SHARP_4 \ CAINIT_B_SHARP_4 \ CAINIT_C_SHARP_3 \ @@ -21,23 +21,24 @@ HEVC_SAMPLES = \ DBLK_A_SONY_3 \ DBLK_B_SONY_3 \ DBLK_C_SONY_3 \ - DBLK_D_VIXS_1 \ DBLK_D_VIXS_2 \ - DBLK_E_VIXS_1 \ DBLK_E_VIXS_2 \ - DBLK_F_VIXS_1 \ DBLK_F_VIXS_2 \ - DBLK_G_VIXS_1 \ DBLK_G_VIXS_2 \ + DELTAQP_A_BRCM_4 \ DELTAQP_B_SONY_3 \ DELTAQP_C_SONY_3 \ DSLICE_A_HHI_5 \ DSLICE_B_HHI_5 \ DSLICE_C_HHI_5 \ - ENTP_A_LG_2 \ - ENTP_B_LG_2 \ - ENTP_C_LG_3 \ + ENTP_A_Qualcomm_1 \ + ENTP_B_Qualcomm_1 \ + ENTP_C_Qualcomm_1 \ EXT_A_ericsson_4 \ + FILLER_A_Sony_1 \ + HRD_A_Fujitsu_2 \ + INITQP_A_Sony_1 \ + INITQP_B_Sony_1 \ ipcm_A_NEC_3 \ ipcm_B_NEC_3 \ ipcm_C_NEC_3 \ @@ -45,7 +46,7 @@ HEVC_SAMPLES = \ ipcm_E_NEC_2 \ IPRED_A_docomo_2 \ IPRED_B_Nokia_3 \ - IPRED_C_Mitsubishi_2 \ + IPRED_C_Mitsubishi_3 \ LS_A_Orange_2 \ LS_B_ORANGE_4 \ LTRPSPS_A_Qualcomm_1 \ @@ -62,7 +63,12 @@ HEVC_SAMPLES = \ MVCLIP_A_qualcomm_3 \ MVDL1ZERO_A_docomo_3 \ MVEDGE_A_qualcomm_3 \ + NoOutPrior_A_Qualcomm_1 \ + NoOutPrior_B_Qualcomm_1 \ NUT_A_ericsson_5 \ + OPFLAG_A_Qualcomm_1 \ + OPFLAG_B_Qualcomm_1 \ + OPFLAG_C_Qualcomm_1 \ PICSIZE_A_Bossen_1 \ PICSIZE_B_Bossen_1 \ PICSIZE_C_Bossen_1 \ @@ -74,9 +80,9 @@ HEVC_SAMPLES = \ PMERGE_E_TI_3 \ POC_A_Bossen_3 \ PPS_A_qualcomm_7 \ - RAP_A_docomo_4 \ PS_A_VIDYO_3 \ PS_B_VIDYO_3 \ + RAP_A_docomo_4 \ RAP_B_Bossen_1 \ RPLM_A_qualcomm_4 \ RPLM_B_qualcomm_4 \ @@ -127,7 +133,7 @@ HEVC_SAMPLES = \ WPP_F_ericsson_MAIN_2 \ HEVC_SAMPLES_10BIT = \ - DBLK_A_MAIN10_VIXS_2 \ + DBLK_A_MAIN10_VIXS_3 \ WP_A_MAIN10_Toshiba_3 \ WP_MAIN10_B_Toshiba_3 \ WPP_A_ericsson_MAIN10_2 \ @@ -137,10 +143,16 @@ HEVC_SAMPLES_10BIT = \ WPP_E_ericsson_MAIN10_2 \ WPP_F_ericsson_MAIN10_2 \ +# equivalent bitstreams +# AMP_D_Hisilicon_3 -- AMP_D_Hisilicon +# AMP_E_Hisilicon_3 -- AMP_E_Hisilicon +# MVDL1ZERO_A_docomo_4 -- MVDL1ZERO_A_docomo_3 +# RAP_A_docomo_5 -- RAP_A_docomo_4 +# RPS_A_docomo_5 -- RPS_A_docomo_4 +# RPS_F_docomo_2 -- RPS_F_docomo_1 + # do not pass: -# DELTAQP_A_BRCM_4.bit -- TODO uses CRC instead of MD5 -# HRD_A_Fujitsu_2.bin -- TODO uses hash 2 ("checksum") -# TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault) +# TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault mix 9-10bits) define FATE_HEVC_TEST FATE_HEVC += fate-hevc-conformance-$(1) diff --git a/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_2 b/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3 similarity index 100% rename from tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_2 rename to tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3 diff --git a/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1 deleted file mode 100644 index 3d9e43b..0000000 --- a/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1 +++ /dev/null @@ -1,9 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 1382400, 0x6ef5c76e -0, 1, 1, 1, 1382400, 0x975238be -0, 2, 2, 1, 1382400, 0xe5529a79 -0, 3, 3, 1, 1382400, 0x639641d4 -0, 4, 4, 1, 1382400, 0x566eb1df -0, 5, 5, 1, 1382400, 0x4fd4b46a -0, 6, 6, 1, 1382400, 0xfb4a6a0e -0, 7, 7, 1, 1382400, 0x4485af32 diff --git a/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1 deleted file mode 100644 index c3ebaf2..0000000 --- a/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1 +++ /dev/null @@ -1,9 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 1382400, 0x7119bbe5 -0, 1, 1, 1, 1382400, 0xbeda2c83 -0, 2, 2, 1, 1382400, 0x2cbe6669 -0, 3, 3, 1, 1382400, 0x3cee2619 -0, 4, 4, 1, 1382400, 0x93e388e3 -0, 5, 5, 1, 1382400, 0x5e286889 -0, 6, 6, 1, 1382400, 0x4718f29c -0, 7, 7, 1, 1382400, 0xbedf4dbd diff --git a/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1 deleted file mode 100644 index 59f51ef..0000000 --- a/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1 +++ /dev/null @@ -1,9 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 1382400, 0xea27f7bd -0, 1, 1, 1, 1382400, 0xce3d7b4c -0, 2, 2, 1, 1382400, 0xaea4970e -0, 3, 3, 1, 1382400, 0xcbc7c89f -0, 4, 4, 1, 1382400, 0xe5367019 -0, 5, 5, 1, 1382400, 0xb92ca18e -0, 6, 6, 1, 1382400, 0xde046be1 -0, 7, 7, 1, 1382400, 0x1ae6e393 diff --git a/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1 deleted file mode 100644 index 4b9793b..0000000 --- a/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1 +++ /dev/null @@ -1,9 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 1382400, 0xecfdf606 -0, 1, 1, 1, 1382400, 0x7607799b -0, 2, 2, 1, 1382400, 0x67fb98e4 -0, 3, 3, 1, 1382400, 0xf2dce07f -0, 4, 4, 1, 1382400, 0x663f991c -0, 5, 5, 1, 1382400, 0x3877aeb0 -0, 6, 6, 1, 1382400, 0x73409282 -0, 7, 7, 1, 1382400, 0x766c10b1 diff --git a/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 new file mode 100644 index 0000000..d2ab0f5 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 @@ -0,0 +1,97 @@ +#tb 0: 1/25 +0, 0, 0, 1, 3133440, 0xfbd10331 +0, 1, 1, 1, 3133440, 0x7764ad70 +0, 2, 2, 1, 3133440, 0xaeaf44c1 +0, 3, 3, 1, 3133440, 0x0590073b +0, 4, 4, 1, 3133440, 0xc4173137 +0, 5, 5, 1, 3133440, 0xd173b667 +0, 6, 6, 1, 3133440, 0xb70253db +0, 7, 7, 1, 3133440, 0x506ada41 +0, 8, 8, 1, 3133440, 0x7748178b +0, 9, 9, 1, 3133440, 0xd5450415 +0, 10, 10, 1, 3133440, 0x2d1cf084 +0, 11, 11, 1, 3133440, 0xc89fb208 +0, 12, 12, 1, 3133440, 0x3d065c44 +0, 13, 13, 1, 3133440, 0x15a67a95 +0, 14, 14, 1, 3133440, 0xde1684ca +0, 15, 15, 1, 3133440, 0xc3e64367 +0, 16, 16, 1, 3133440, 0x5bf1bd00 +0, 17, 17, 1, 3133440, 0x253703c8 +0, 18, 18, 1, 3133440, 0x5c5fb22b +0, 19, 19, 1, 3133440, 0x5fcd0915 +0, 20, 20, 1, 3133440, 0xb6fe6c0d +0, 21, 21, 1, 3133440, 0x3673f749 +0, 22, 22, 1, 3133440, 0x42535c71 +0, 23, 23, 1, 3133440, 0x889fd32d +0, 24, 24, 1, 3133440, 0x259c6c22 +0, 25, 25, 1, 3133440, 0x128844a2 +0, 26, 26, 1, 3133440, 0x34d9ead6 +0, 27, 27, 1, 3133440, 0x0a68658a +0, 28, 28, 1, 3133440, 0x3aa96f3e +0, 29, 29, 1, 3133440, 0x20249702 +0, 30, 30, 1, 3133440, 0x6d14a401 +0, 31, 31, 1, 3133440, 0xf6acf9ae +0, 32, 32, 1, 3133440, 0x0894adfb +0, 33, 33, 1, 3133440, 0x664178bb +0, 34, 34, 1, 3133440, 0x6b9305df +0, 35, 35, 1, 3133440, 0x8afd4ab4 +0, 36, 36, 1, 3133440, 0x1869c2aa +0, 37, 37, 1, 3133440, 0x004f3a7d +0, 38, 38, 1, 3133440, 0xadeb9a81 +0, 39, 39, 1, 3133440, 0xbeffc378 +0, 40, 40, 1, 3133440, 0x58c34e3c +0, 41, 41, 1, 3133440, 0x5b07ad91 +0, 42, 42, 1, 3133440, 0x41bf5cb6 +0, 43, 43, 1, 3133440, 0x65ebea43 +0, 44, 44, 1, 3133440, 0x9c2462ae +0, 45, 45, 1, 3133440, 0x3cbc1a04 +0, 46, 46, 1, 3133440, 0x0debbeeb +0, 47, 47, 1, 3133440, 0x954399f6 +0, 48, 48, 1, 3133440, 0x3ba1b057 +0, 49, 49, 1, 3133440, 0x3b5a0cae +0, 50, 50, 1, 3133440, 0xfdf6c423 +0, 51, 51, 1, 3133440, 0x08097c97 +0, 52, 52, 1, 3133440, 0x13f06984 +0, 53, 53, 1, 3133440, 0x52a3baec +0, 54, 54, 1, 3133440, 0x7961fb92 +0, 55, 55, 1, 3133440, 0xb6805a96 +0, 56, 56, 1, 3133440, 0xde1c16e9 +0, 57, 57, 1, 3133440, 0x07cb1ffc +0, 58, 58, 1, 3133440, 0xad1a1f91 +0, 59, 59, 1, 3133440, 0x77bb5968 +0, 60, 60, 1, 3133440, 0x85e8074c +0, 61, 61, 1, 3133440, 0x1a2919ef +0, 62, 62, 1, 3133440, 0x81540640 +0, 63, 63, 1, 3133440, 0xd61a3574 +0, 64, 64, 1, 3133440, 0xf875c32c +0, 65, 65, 1, 3133440, 0x50548308 +0, 66, 66, 1, 3133440, 0xf98ee7e9 +0, 67, 67, 1, 3133440, 0xb7b4cb8e +0, 68, 68, 1, 3133440, 0x1c22b2b7 +0, 69, 69, 1, 3133440, 0x2ea55366 +0, 70, 70, 1, 3133440, 0x82e76ac5 +0, 71, 71, 1, 3133440, 0x292af798 +0, 72, 72, 1, 3133440, 0x29508415 +0, 73, 73, 1, 3133440, 0x4ef87b17 +0, 74, 74, 1, 3133440, 0xa6eeb679 +0, 75, 75, 1, 3133440, 0xfe69f819 +0, 76, 76, 1, 3133440, 0x95bb6b49 +0, 77, 77, 1, 3133440, 0x5bf3f8ad +0, 78, 78, 1, 3133440, 0x58113e3a +0, 79, 79, 1, 3133440, 0xd87b6888 +0, 80, 80, 1, 3133440, 0xb3e7a295 +0, 81, 81, 1, 3133440, 0x3c2c7f97 +0, 82, 82, 1, 3133440, 0xe5f5cc48 +0, 83, 83, 1, 3133440, 0xa222f3e6 +0, 84, 84, 1, 3133440, 0x6ae80e0b +0, 85, 85, 1, 3133440, 0x2bc02816 +0, 86, 86, 1, 3133440, 0x2a5043cb +0, 87, 87, 1, 3133440, 0x857089b9 +0, 88, 88, 1, 3133440, 0xf3443ad1 +0, 89, 89, 1, 3133440, 0x7cb10b4c +0, 90, 90, 1, 3133440, 0x75bb32b9 +0, 91, 91, 1, 3133440, 0x6b720e0f +0, 92, 92, 1, 3133440, 0x761571be +0, 93, 93, 1, 3133440, 0x34dc14a1 +0, 94, 94, 1, 3133440, 0xbb94c2d4 +0, 95, 95, 1, 3133440, 0x5300e459 diff --git a/tests/ref/fate/hevc-conformance-ENTP_A_LG_2 b/tests/ref/fate/hevc-conformance-ENTP_A_LG_2 deleted file mode 100644 index 5697619..0000000 --- a/tests/ref/fate/hevc-conformance-ENTP_A_LG_2 +++ /dev/null @@ -1,51 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 599040, 0x866449d5 -0, 1, 1, 1, 599040, 0x6a8919f0 -0, 2, 2, 1, 599040, 0x5bec3742 -0, 3, 3, 1, 599040, 0x0e66f78b -0, 4, 4, 1, 599040, 0x798e543b -0, 5, 5, 1, 599040, 0x342467e0 -0, 6, 6, 1, 599040, 0x2cb393e1 -0, 7, 7, 1, 599040, 0x2f326539 -0, 8, 8, 1, 599040, 0x8ac6eb6a -0, 9, 9, 1, 599040, 0x810a887b -0, 10, 10, 1, 599040, 0x4feb2d60 -0, 11, 11, 1, 599040, 0xd32165ff -0, 12, 12, 1, 599040, 0x46e505e1 -0, 13, 13, 1, 599040, 0x2d917014 -0, 14, 14, 1, 599040, 0xb504f112 -0, 15, 15, 1, 599040, 0x0fca37ce -0, 16, 16, 1, 599040, 0x2d5a269d -0, 17, 17, 1, 599040, 0x3928ef6d -0, 18, 18, 1, 599040, 0x94397312 -0, 19, 19, 1, 599040, 0xc1c1257b -0, 20, 20, 1, 599040, 0x4e23adcc -0, 21, 21, 1, 599040, 0x3eaef1e0 -0, 22, 22, 1, 599040, 0x5e66fa14 -0, 23, 23, 1, 599040, 0x2adfa0c2 -0, 24, 24, 1, 599040, 0xf888db90 -0, 25, 25, 1, 599040, 0xab3a6418 -0, 26, 26, 1, 599040, 0x7689d0a2 -0, 27, 27, 1, 599040, 0x2f5746bf -0, 28, 28, 1, 599040, 0xad2cf3da -0, 29, 29, 1, 599040, 0x32f2854e -0, 30, 30, 1, 599040, 0xb73cf7db -0, 31, 31, 1, 599040, 0xbe996991 -0, 32, 32, 1, 599040, 0xe66501c8 -0, 33, 33, 1, 599040, 0x12d1bc13 -0, 34, 34, 1, 599040, 0x06e103d5 -0, 35, 35, 1, 599040, 0x49af0680 -0, 36, 36, 1, 599040, 0xdbf128b0 -0, 37, 37, 1, 599040, 0xa1ac770d -0, 38, 38, 1, 599040, 0x99156429 -0, 39, 39, 1, 599040, 0x8ce1a9a7 -0, 40, 40, 1, 599040, 0x14067700 -0, 41, 41, 1, 599040, 0xcdedccee -0, 42, 42, 1, 599040, 0x09c12765 -0, 43, 43, 1, 599040, 0x7979a1be -0, 44, 44, 1, 599040, 0xbd3148d1 -0, 45, 45, 1, 599040, 0xc83f9aac -0, 46, 46, 1, 599040, 0x91acbae4 -0, 47, 47, 1, 599040, 0xd230907a -0, 48, 48, 1, 599040, 0x3f6c31f6 -0, 49, 49, 1, 599040, 0x84496e55 diff --git a/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1 new file mode 100644 index 0000000..4454bfa --- /dev/null +++ b/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1 @@ -0,0 +1,25 @@ +#tb 0: 1/25 +0, 0, 0, 1, 3110400, 0x26663e50 +0, 1, 1, 1, 3110400, 0x64ae36c1 +0, 2, 2, 1, 3110400, 0x5c72ac0b +0, 3, 3, 1, 3110400, 0x13617553 +0, 4, 4, 1, 3110400, 0xee94be8a +0, 5, 5, 1, 3110400, 0x6324f8da +0, 6, 6, 1, 3110400, 0xea0dd277 +0, 7, 7, 1, 3110400, 0xdf3e6b85 +0, 8, 8, 1, 3110400, 0xdc754b17 +0, 9, 9, 1, 3110400, 0xbb53a891 +0, 10, 10, 1, 3110400, 0x53c6575a +0, 11, 11, 1, 3110400, 0xda720794 +0, 12, 12, 1, 3110400, 0x21be3522 +0, 13, 13, 1, 3110400, 0x7fd72aa9 +0, 14, 14, 1, 3110400, 0xeb0d104a +0, 15, 15, 1, 3110400, 0xd038405a +0, 16, 16, 1, 3110400, 0xd1f8b9fa +0, 17, 17, 1, 3110400, 0xc96d2b8c +0, 18, 18, 1, 3110400, 0x07f77dcd +0, 19, 19, 1, 3110400, 0x673b444c +0, 20, 20, 1, 3110400, 0x5a8b4836 +0, 21, 21, 1, 3110400, 0x1ce733d3 +0, 22, 22, 1, 3110400, 0xd919ae60 +0, 23, 23, 1, 3110400, 0x5dcc11c0 diff --git a/tests/ref/fate/hevc-conformance-ENTP_B_LG_2 b/tests/ref/fate/hevc-conformance-ENTP_B_LG_2 deleted file mode 100644 index 0251f30..0000000 --- a/tests/ref/fate/hevc-conformance-ENTP_B_LG_2 +++ /dev/null @@ -1,51 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 599040, 0x95a24137 -0, 1, 1, 1, 599040, 0x7d7f2b75 -0, 2, 2, 1, 599040, 0xd9fb2120 -0, 3, 3, 1, 599040, 0x14d50590 -0, 4, 4, 1, 599040, 0xe3d1b70e -0, 5, 5, 1, 599040, 0x57708a86 -0, 6, 6, 1, 599040, 0xae56a720 -0, 7, 7, 1, 599040, 0x74c18679 -0, 8, 8, 1, 599040, 0x6422d2a7 -0, 9, 9, 1, 599040, 0xf587702b -0, 10, 10, 1, 599040, 0x0f630fe0 -0, 11, 11, 1, 599040, 0x4e3537dd -0, 12, 12, 1, 599040, 0xa645e9c1 -0, 13, 13, 1, 599040, 0x35ab4155 -0, 14, 14, 1, 599040, 0x4b78ba34 -0, 15, 15, 1, 599040, 0xa9a9e572 -0, 16, 16, 1, 599040, 0x6d57f10f -0, 17, 17, 1, 599040, 0xffb8e333 -0, 18, 18, 1, 599040, 0x7b2d6319 -0, 19, 19, 1, 599040, 0xcf3319aa -0, 20, 20, 1, 599040, 0xb0d097ee -0, 21, 21, 1, 599040, 0xf042f780 -0, 22, 22, 1, 599040, 0xfafafdcb -0, 23, 23, 1, 599040, 0xc8c1c452 -0, 24, 24, 1, 599040, 0x83c4d488 -0, 25, 25, 1, 599040, 0x81a8fd08 -0, 26, 26, 1, 599040, 0x2cb0c333 -0, 27, 27, 1, 599040, 0xa7bf4e52 -0, 28, 28, 1, 599040, 0x5b7ed8e9 -0, 29, 29, 1, 599040, 0x4ff03464 -0, 30, 30, 1, 599040, 0x54a700c2 -0, 31, 31, 1, 599040, 0x7dbb63aa -0, 32, 32, 1, 599040, 0xda26288e -0, 33, 33, 1, 599040, 0x8074da41 -0, 34, 34, 1, 599040, 0xa32b2ab2 -0, 35, 35, 1, 599040, 0x51b457fb -0, 36, 36, 1, 599040, 0x05e34953 -0, 37, 37, 1, 599040, 0x68c762d6 -0, 38, 38, 1, 599040, 0x11bf469e -0, 39, 39, 1, 599040, 0xc2fdadaf -0, 40, 40, 1, 599040, 0x05588da0 -0, 41, 41, 1, 599040, 0x8855f927 -0, 42, 42, 1, 599040, 0x11c85d5a -0, 43, 43, 1, 599040, 0x7a0aede5 -0, 44, 44, 1, 599040, 0x39dc4f7d -0, 45, 45, 1, 599040, 0x388f81d6 -0, 46, 46, 1, 599040, 0x2afa830d -0, 47, 47, 1, 599040, 0xd7f26886 -0, 48, 48, 1, 599040, 0xb8e12aef -0, 49, 49, 1, 599040, 0x73f7582c diff --git a/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1 new file mode 100644 index 0000000..547b590 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1 @@ -0,0 +1,25 @@ +#tb 0: 1/25 +0, 0, 0, 1, 3110400, 0x7d014690 +0, 1, 1, 1, 3110400, 0xe02cd173 +0, 2, 2, 1, 3110400, 0x2f9794c5 +0, 3, 3, 1, 3110400, 0x5df433de +0, 4, 4, 1, 3110400, 0xae409f1d +0, 5, 5, 1, 3110400, 0xb4886e82 +0, 6, 6, 1, 3110400, 0x636ee735 +0, 7, 7, 1, 3110400, 0x4d340b3f +0, 8, 8, 1, 3110400, 0xf11ce983 +0, 9, 9, 1, 3110400, 0x2a1b2094 +0, 10, 10, 1, 3110400, 0x1dee485f +0, 11, 11, 1, 3110400, 0xac329574 +0, 12, 12, 1, 3110400, 0xa0f11f30 +0, 13, 13, 1, 3110400, 0x99d827d3 +0, 14, 14, 1, 3110400, 0xa0b75c5b +0, 15, 15, 1, 3110400, 0xf3f169d8 +0, 16, 16, 1, 3110400, 0xde71892b +0, 17, 17, 1, 3110400, 0xf1129a0e +0, 18, 18, 1, 3110400, 0x02150e54 +0, 19, 19, 1, 3110400, 0xc79d65a4 +0, 20, 20, 1, 3110400, 0x708fc8fb +0, 21, 21, 1, 3110400, 0x5431050b +0, 22, 22, 1, 3110400, 0x237faa60 +0, 23, 23, 1, 3110400, 0xb05ffa7c diff --git a/tests/ref/fate/hevc-conformance-ENTP_C_LG_3 b/tests/ref/fate/hevc-conformance-ENTP_C_LG_3 deleted file mode 100644 index 3c0946e..0000000 --- a/tests/ref/fate/hevc-conformance-ENTP_C_LG_3 +++ /dev/null @@ -1,51 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 3110400, 0xaea1c3d6 -0, 1, 1, 1, 3110400, 0x665b4f52 -0, 2, 2, 1, 3110400, 0xc7da58a2 -0, 3, 3, 1, 3110400, 0x1dda6461 -0, 4, 4, 1, 3110400, 0x1d8d6eaf -0, 5, 5, 1, 3110400, 0x7a29911a -0, 6, 6, 1, 3110400, 0x0dce92c9 -0, 7, 7, 1, 3110400, 0x79c84570 -0, 8, 8, 1, 3110400, 0x736ef1e7 -0, 9, 9, 1, 3110400, 0x9dd86492 -0, 10, 10, 1, 3110400, 0x0ea31a1b -0, 11, 11, 1, 3110400, 0x0d84fdc8 -0, 12, 12, 1, 3110400, 0x06ed89a7 -0, 13, 13, 1, 3110400, 0xfaea4fd6 -0, 14, 14, 1, 3110400, 0xe787abe8 -0, 15, 15, 1, 3110400, 0x050b653a -0, 16, 16, 1, 3110400, 0x35cc1ec1 -0, 17, 17, 1, 3110400, 0x86a43e07 -0, 18, 18, 1, 3110400, 0xa6ab021e -0, 19, 19, 1, 3110400, 0x491e0efa -0, 20, 20, 1, 3110400, 0x8f210c38 -0, 21, 21, 1, 3110400, 0x637af0d0 -0, 22, 22, 1, 3110400, 0x47a59197 -0, 23, 23, 1, 3110400, 0x53e04637 -0, 24, 24, 1, 3110400, 0x7b99325e -0, 25, 25, 1, 3110400, 0x972aa252 -0, 26, 26, 1, 3110400, 0xe76ef917 -0, 27, 27, 1, 3110400, 0x7a25babc -0, 28, 28, 1, 3110400, 0x3bee3c5c -0, 29, 29, 1, 3110400, 0xbae82bcb -0, 30, 30, 1, 3110400, 0x5b65c1e5 -0, 31, 31, 1, 3110400, 0xa546266f -0, 32, 32, 1, 3110400, 0x5c5b9b8e -0, 33, 33, 1, 3110400, 0xec29c804 -0, 34, 34, 1, 3110400, 0x384efc7d -0, 35, 35, 1, 3110400, 0x6c1aaa23 -0, 36, 36, 1, 3110400, 0x55494f9f -0, 37, 37, 1, 3110400, 0xa9c56fec -0, 38, 38, 1, 3110400, 0x49c29ef2 -0, 39, 39, 1, 3110400, 0xac24fdd4 -0, 40, 40, 1, 3110400, 0x403d8213 -0, 41, 41, 1, 3110400, 0xf2d8aefe -0, 42, 42, 1, 3110400, 0x2884f0e1 -0, 43, 43, 1, 3110400, 0x69a0a781 -0, 44, 44, 1, 3110400, 0x3ab6114c -0, 45, 45, 1, 3110400, 0x1d4425a2 -0, 46, 46, 1, 3110400, 0x59f8970a -0, 47, 47, 1, 3110400, 0xfe0a05a9 -0, 48, 48, 1, 3110400, 0x50b9be4f -0, 49, 49, 1, 3110400, 0x3e1b65bd diff --git a/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1 b/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1 new file mode 100644 index 0000000..2c21f35 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1 @@ -0,0 +1,25 @@ +#tb 0: 1/25 +0, 0, 0, 1, 3110400, 0x4ea3fa57 +0, 1, 1, 1, 3110400, 0xbe33724f +0, 2, 2, 1, 3110400, 0x9011755e +0, 3, 3, 1, 3110400, 0x62de338c +0, 4, 4, 1, 3110400, 0xa49096c5 +0, 5, 5, 1, 3110400, 0xc7af7402 +0, 6, 6, 1, 3110400, 0xd8241f6b +0, 7, 7, 1, 3110400, 0x82ebc552 +0, 8, 8, 1, 3110400, 0x57c07503 +0, 9, 9, 1, 3110400, 0xc302fc68 +0, 10, 10, 1, 3110400, 0x10183476 +0, 11, 11, 1, 3110400, 0xa953ab4b +0, 12, 12, 1, 3110400, 0xe1daee4f +0, 13, 13, 1, 3110400, 0x86828802 +0, 14, 14, 1, 3110400, 0x9bb96175 +0, 15, 15, 1, 3110400, 0xe6c033a0 +0, 16, 16, 1, 3110400, 0x417407dd +0, 17, 17, 1, 3110400, 0x422ef66c +0, 18, 18, 1, 3110400, 0x3d216600 +0, 19, 19, 1, 3110400, 0xdfd83135 +0, 20, 20, 1, 3110400, 0x8deff979 +0, 21, 21, 1, 3110400, 0xbce973f4 +0, 22, 22, 1, 3110400, 0x2ae172e2 +0, 23, 23, 1, 3110400, 0x2aa32f21 diff --git a/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1 b/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1 new file mode 100644 index 0000000..809b4cd --- /dev/null +++ b/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1 @@ -0,0 +1,61 @@ +#tb 0: 1001/30000 +0, 0, 0, 1, 149760, 0x83261e41 +0, 1, 1, 1, 149760, 0xa8c02e8e +0, 2, 2, 1, 149760, 0xb89d1fa0 +0, 3, 3, 1, 149760, 0x22f83f2a +0, 4, 4, 1, 149760, 0x0529e619 +0, 5, 5, 1, 149760, 0x18488682 +0, 6, 6, 1, 149760, 0x91c0fde2 +0, 7, 7, 1, 149760, 0xe07355aa +0, 8, 8, 1, 149760, 0x6deca92f +0, 9, 9, 1, 149760, 0xcd16e610 +0, 10, 10, 1, 149760, 0x3fd6cab8 +0, 11, 11, 1, 149760, 0x063e39e4 +0, 12, 12, 1, 149760, 0x8b1fb242 +0, 13, 13, 1, 149760, 0x00ef6987 +0, 14, 14, 1, 149760, 0xdfa7e8ab +0, 15, 15, 1, 149760, 0x315a23a8 +0, 16, 16, 1, 149760, 0xdd655173 +0, 17, 17, 1, 149760, 0x741b9603 +0, 18, 18, 1, 149760, 0x4a3c29a4 +0, 19, 19, 1, 149760, 0xb14b06f4 +0, 20, 20, 1, 149760, 0x5dd7fa14 +0, 21, 21, 1, 149760, 0x60dac9fe +0, 22, 22, 1, 149760, 0x231effa8 +0, 23, 23, 1, 149760, 0x6b0cca33 +0, 24, 24, 1, 149760, 0xb1fc6596 +0, 25, 25, 1, 149760, 0x683fa8b5 +0, 26, 26, 1, 149760, 0xa9da45be +0, 27, 27, 1, 149760, 0x96d69624 +0, 28, 28, 1, 149760, 0xff9e0778 +0, 29, 29, 1, 149760, 0x7410078e +0, 30, 30, 1, 149760, 0x6418b280 +0, 31, 31, 1, 149760, 0xee66b0dd +0, 32, 32, 1, 149760, 0xdf4d06fb +0, 33, 33, 1, 149760, 0xf75c33fd +0, 34, 34, 1, 149760, 0x73e97017 +0, 35, 35, 1, 149760, 0xcc8c4e15 +0, 36, 36, 1, 149760, 0xa494d7f7 +0, 37, 37, 1, 149760, 0x57564b5f +0, 38, 38, 1, 149760, 0x84433b5c +0, 39, 39, 1, 149760, 0x8ec138cf +0, 40, 40, 1, 149760, 0x72a9e2df +0, 41, 41, 1, 149760, 0x69ee26c7 +0, 42, 42, 1, 149760, 0x8d85941b +0, 43, 43, 1, 149760, 0xfa9f41a2 +0, 44, 44, 1, 149760, 0x2ec9d6df +0, 45, 45, 1, 149760, 0xb9a85b2b +0, 46, 46, 1, 149760, 0xea10c86d +0, 47, 47, 1, 149760, 0x2a2d0c1b +0, 48, 48, 1, 149760, 0xb96395d7 +0, 49, 49, 1, 149760, 0xb9abdbde +0, 50, 50, 1, 149760, 0x8aff19ae +0, 51, 51, 1, 149760, 0xa46d1e0b +0, 52, 52, 1, 149760, 0xb5943391 +0, 53, 53, 1, 149760, 0x49aacf5c +0, 54, 54, 1, 149760, 0x837b6b38 +0, 55, 55, 1, 149760, 0x1455d41b +0, 56, 56, 1, 149760, 0xf5b87056 +0, 57, 57, 1, 149760, 0x15ef5ca7 +0, 58, 58, 1, 149760, 0x29edded5 +0, 59, 59, 1, 149760, 0x86f1eb45 diff --git a/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2 b/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2 new file mode 100644 index 0000000..d887df2 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2 @@ -0,0 +1,97 @@ +#tb 0: 1/50 +0, 0, 0, 1, 149760, 0x49bcac59 +0, 1, 1, 1, 149760, 0x30ffadcd +0, 2, 2, 1, 149760, 0x85ccc14a +0, 3, 3, 1, 149760, 0x9e80bab5 +0, 4, 4, 1, 149760, 0xf4d6b065 +0, 5, 5, 1, 149760, 0x3dfea025 +0, 6, 6, 1, 149760, 0x752381f4 +0, 7, 7, 1, 149760, 0x55875176 +0, 8, 8, 1, 149760, 0xaeeceea9 +0, 9, 9, 1, 149760, 0xfa19792b +0, 10, 10, 1, 149760, 0x1f0cfa3c +0, 11, 11, 1, 149760, 0xecc09b1a +0, 12, 12, 1, 149760, 0x816e4e1b +0, 13, 13, 1, 149760, 0x375cef94 +0, 14, 14, 1, 149760, 0xace1a0ff +0, 15, 15, 1, 149760, 0x85827658 +0, 16, 16, 1, 149760, 0x8189237e +0, 17, 17, 1, 149760, 0xec53e171 +0, 18, 18, 1, 149760, 0x0b1bad4a +0, 19, 19, 1, 149760, 0x9d566fd0 +0, 20, 20, 1, 149760, 0x9b323c87 +0, 21, 21, 1, 149760, 0x2d900cb7 +0, 22, 22, 1, 149760, 0x7062ed06 +0, 23, 23, 1, 149760, 0xe687c687 +0, 24, 24, 1, 149760, 0x4767dd46 +0, 25, 25, 1, 149760, 0xf0d04aae +0, 26, 26, 1, 149760, 0x1a9d0640 +0, 27, 27, 1, 149760, 0xc831e356 +0, 28, 28, 1, 149760, 0x3b5ee48b +0, 29, 29, 1, 149760, 0x083f94ec +0, 30, 30, 1, 149760, 0xfd92050f +0, 31, 31, 1, 149760, 0x23ce5764 +0, 32, 32, 1, 149760, 0x98167d17 +0, 33, 33, 1, 149760, 0x458a1e97 +0, 34, 34, 1, 149760, 0x913fe090 +0, 35, 35, 1, 149760, 0xdf87fb99 +0, 36, 36, 1, 149760, 0x2c9ffb76 +0, 37, 37, 1, 149760, 0xe52b1f88 +0, 38, 38, 1, 149760, 0xeb6441b3 +0, 39, 39, 1, 149760, 0x229a3428 +0, 40, 40, 1, 149760, 0xab5dc58c +0, 41, 41, 1, 149760, 0xfdaff77d +0, 42, 42, 1, 149760, 0x120326dc +0, 43, 43, 1, 149760, 0x9a9ff8fd +0, 44, 44, 1, 149760, 0x4e5bb152 +0, 45, 45, 1, 149760, 0x2d16f231 +0, 46, 46, 1, 149760, 0x99a01d57 +0, 47, 47, 1, 149760, 0x3a555c12 +0, 48, 48, 1, 149760, 0x20ad0e79 +0, 49, 49, 1, 149760, 0xc62724f2 +0, 50, 50, 1, 149760, 0x07a81153 +0, 51, 51, 1, 149760, 0x14b9732e +0, 52, 52, 1, 149760, 0xeefa0be1 +0, 53, 53, 1, 149760, 0x95a82b9e +0, 54, 54, 1, 149760, 0xa6ecbed4 +0, 55, 55, 1, 149760, 0xaaec0cf6 +0, 56, 56, 1, 149760, 0x087815ca +0, 57, 57, 1, 149760, 0xff82b221 +0, 58, 58, 1, 149760, 0x709afb9f +0, 59, 59, 1, 149760, 0xb91e712a +0, 60, 60, 1, 149760, 0x66dfbaaa +0, 61, 61, 1, 149760, 0x574501b2 +0, 62, 62, 1, 149760, 0xe1c13daf +0, 63, 63, 1, 149760, 0xdab85ad6 +0, 64, 64, 1, 149760, 0x57e8a455 +0, 65, 65, 1, 149760, 0xfc95db86 +0, 66, 66, 1, 149760, 0xe298f7ee +0, 67, 67, 1, 149760, 0x13302040 +0, 68, 68, 1, 149760, 0x69811199 +0, 69, 69, 1, 149760, 0x64f31874 +0, 70, 70, 1, 149760, 0xc1450115 +0, 71, 71, 1, 149760, 0xf0efc355 +0, 72, 72, 1, 149760, 0xeaee572d +0, 73, 73, 1, 149760, 0xf256fc07 +0, 74, 74, 1, 149760, 0x20d48047 +0, 75, 75, 1, 149760, 0x37a934bf +0, 76, 76, 1, 149760, 0xd14bcc48 +0, 77, 77, 1, 149760, 0x3de67683 +0, 78, 78, 1, 149760, 0x3b3b2edd +0, 79, 79, 1, 149760, 0x8cf00f8d +0, 80, 80, 1, 149760, 0x83d8ddff +0, 81, 81, 1, 149760, 0xf2f36ae4 +0, 82, 82, 1, 149760, 0xf2549f1a +0, 83, 83, 1, 149760, 0x6c5a9443 +0, 84, 84, 1, 149760, 0x071e4d64 +0, 85, 85, 1, 149760, 0x0b160074 +0, 86, 86, 1, 149760, 0x0ebdf969 +0, 87, 87, 1, 149760, 0x0331793d +0, 88, 88, 1, 149760, 0xee7ad61f +0, 89, 89, 1, 149760, 0xb9ba083f +0, 90, 90, 1, 149760, 0x8ecf1f9d +0, 91, 91, 1, 149760, 0x6e861158 +0, 92, 92, 1, 149760, 0x977a203b +0, 93, 93, 1, 149760, 0xa25d1077 +0, 94, 94, 1, 149760, 0xa4d2fca1 +0, 95, 95, 1, 149760, 0x6093084d diff --git a/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1 b/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1 new file mode 100644 index 0000000..e99e389 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1 @@ -0,0 +1,61 @@ +#tb 0: 1001/30000 +0, 0, 0, 1, 149760, 0x59891e4e +0, 1, 1, 1, 149760, 0x6c152de8 +0, 2, 2, 1, 149760, 0x6f2c0f37 +0, 3, 3, 1, 149760, 0xdc4142e9 +0, 4, 4, 1, 149760, 0x13a6dfe0 +0, 5, 5, 1, 149760, 0xea2b8197 +0, 6, 6, 1, 149760, 0x228207b8 +0, 7, 7, 1, 149760, 0xe6c33dc5 +0, 8, 8, 1, 149760, 0xa488a0f6 +0, 9, 9, 1, 149760, 0xf618c591 +0, 10, 10, 1, 149760, 0x0c96c7eb +0, 11, 11, 1, 149760, 0x347b17b8 +0, 12, 12, 1, 149760, 0xa2379e18 +0, 13, 13, 1, 149760, 0x635a7cbd +0, 14, 14, 1, 149760, 0xa770ed3c +0, 15, 15, 1, 149760, 0x54271b2b +0, 16, 16, 1, 149760, 0xc09751d6 +0, 17, 17, 1, 149760, 0xa33997cb +0, 18, 18, 1, 149760, 0x8f382ef3 +0, 19, 19, 1, 149760, 0x449311d8 +0, 20, 20, 1, 149760, 0x67a2f419 +0, 21, 21, 1, 149760, 0xa025b8a1 +0, 22, 22, 1, 149760, 0xebb7e911 +0, 23, 23, 1, 149760, 0x6decb08e +0, 24, 24, 1, 149760, 0x20a354ef +0, 25, 25, 1, 149760, 0x6d609fc5 +0, 26, 26, 1, 149760, 0x73992f9b +0, 27, 27, 1, 149760, 0x46968752 +0, 28, 28, 1, 149760, 0xd9e9017d +0, 29, 29, 1, 149760, 0xae321b3c +0, 30, 30, 1, 149760, 0x0f53a016 +0, 31, 31, 1, 149760, 0x74a5aacd +0, 32, 32, 1, 149760, 0x893afc39 +0, 33, 33, 1, 149760, 0xbeb13aed +0, 34, 34, 1, 149760, 0xc8658ed9 +0, 35, 35, 1, 149760, 0xcf7d544e +0, 36, 36, 1, 149760, 0x782bd063 +0, 37, 37, 1, 149760, 0x32c53ffa +0, 38, 38, 1, 149760, 0xed3849c2 +0, 39, 39, 1, 149760, 0xda5f336a +0, 40, 40, 1, 149760, 0x0460dbf7 +0, 41, 41, 1, 149760, 0x782f25e3 +0, 42, 42, 1, 149760, 0x1199900a +0, 43, 43, 1, 149760, 0xd51e4dfd +0, 44, 44, 1, 149760, 0xfd32e6d5 +0, 45, 45, 1, 149760, 0x880d5f9b +0, 46, 46, 1, 149760, 0xe1a7b52d +0, 47, 47, 1, 149760, 0x97c4228a +0, 48, 48, 1, 149760, 0x0c539d58 +0, 49, 49, 1, 149760, 0x5edfd99e +0, 50, 50, 1, 149760, 0x92a40dcc +0, 51, 51, 1, 149760, 0xa33dff8d +0, 52, 52, 1, 149760, 0xf9f637ee +0, 53, 53, 1, 149760, 0x4c02c63d +0, 54, 54, 1, 149760, 0x94125eda +0, 55, 55, 1, 149760, 0x0ba6d181 +0, 56, 56, 1, 149760, 0x1c4b7cf1 +0, 57, 57, 1, 149760, 0x3af454c4 +0, 58, 58, 1, 149760, 0x3666e3f4 +0, 59, 59, 1, 149760, 0x1013f2ec diff --git a/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1 b/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1 new file mode 100644 index 0000000..e00c29f --- /dev/null +++ b/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1 @@ -0,0 +1,91 @@ +#tb 0: 1001/30000 +0, 0, 0, 1, 299520, 0x5514958a +0, 1, 1, 1, 299520, 0x06725ede +0, 2, 2, 1, 299520, 0xa71d1493 +0, 3, 3, 1, 299520, 0xdd4cde37 +0, 4, 4, 1, 299520, 0x6ea2f981 +0, 5, 5, 1, 299520, 0x34de0d7f +0, 6, 6, 1, 299520, 0xe3555f62 +0, 7, 7, 1, 299520, 0xa56cf8b5 +0, 8, 8, 1, 299520, 0x74f85f70 +0, 9, 9, 1, 299520, 0x7cc4ff3b +0, 10, 10, 1, 299520, 0xacaf62f0 +0, 11, 11, 1, 299520, 0x049aa473 +0, 12, 12, 1, 299520, 0x3d202b52 +0, 13, 13, 1, 299520, 0x530920d5 +0, 14, 14, 1, 299520, 0xcf69e5c8 +0, 15, 15, 1, 299520, 0x18ad9a4f +0, 16, 16, 1, 299520, 0xc8c1bbd9 +0, 17, 17, 1, 299520, 0x6cd37ffc +0, 18, 18, 1, 299520, 0xc8d64c57 +0, 19, 19, 1, 299520, 0xec4679bf +0, 20, 20, 1, 299520, 0xc4228355 +0, 21, 21, 1, 299520, 0x908c71b0 +0, 22, 22, 1, 299520, 0x4c4a92eb +0, 23, 23, 1, 299520, 0x28f7d30d +0, 24, 24, 1, 299520, 0xed2db3da +0, 25, 25, 1, 299520, 0xfb22801f +0, 26, 26, 1, 299520, 0x514de5b9 +0, 27, 27, 1, 299520, 0x7bb8d8f7 +0, 28, 28, 1, 299520, 0x3e43ae30 +0, 29, 29, 1, 299520, 0x45473924 +0, 30, 30, 1, 299520, 0x914a440e +0, 31, 31, 1, 299520, 0x91e74926 +0, 32, 32, 1, 299520, 0xa8a43ffd +0, 33, 33, 1, 299520, 0x1df08075 +0, 34, 34, 1, 299520, 0x84611007 +0, 35, 35, 1, 299520, 0x622d7495 +0, 36, 36, 1, 299520, 0xede897b6 +0, 37, 37, 1, 299520, 0xb14f0650 +0, 38, 38, 1, 299520, 0x74f600f9 +0, 39, 39, 1, 299520, 0xf04e2de3 +0, 40, 40, 1, 299520, 0xaeadd6fc +0, 41, 41, 1, 299520, 0xb5855f8d +0, 42, 42, 1, 299520, 0xbb6c709f +0, 43, 43, 1, 299520, 0x486d66e9 +0, 44, 44, 1, 299520, 0x87e7d165 +0, 45, 45, 1, 299520, 0x1f936d47 +0, 46, 46, 1, 299520, 0x2da721a2 +0, 47, 47, 1, 299520, 0x36caf481 +0, 48, 48, 1, 299520, 0x067e3f4d +0, 49, 49, 1, 299520, 0x1a95c86b +0, 50, 50, 1, 299520, 0x186c1bde +0, 51, 51, 1, 299520, 0xd1552b21 +0, 52, 52, 1, 299520, 0x72521786 +0, 53, 53, 1, 299520, 0xe0f0b1b2 +0, 54, 54, 1, 299520, 0xee8c6751 +0, 55, 55, 1, 299520, 0x281817ef +0, 56, 56, 1, 299520, 0xea98b174 +0, 57, 57, 1, 299520, 0x839575de +0, 58, 58, 1, 299520, 0xd89b6ff1 +0, 59, 59, 1, 299520, 0xee8432a7 +0, 60, 60, 1, 299520, 0x8f262218 +0, 61, 61, 1, 299520, 0xac918f83 +0, 62, 62, 1, 299520, 0x398c23d7 +0, 63, 63, 1, 299520, 0xdc560109 +0, 64, 64, 1, 299520, 0xb4c3cd8b +0, 65, 65, 1, 299520, 0x79824026 +0, 66, 66, 1, 299520, 0xd20f5be8 +0, 67, 67, 1, 299520, 0xc93b32a3 +0, 68, 68, 1, 299520, 0xc1363d67 +0, 69, 69, 1, 299520, 0xeb6d2f0a +0, 70, 70, 1, 299520, 0x29053a08 +0, 71, 71, 1, 299520, 0x8a236752 +0, 72, 72, 1, 299520, 0x5e572146 +0, 73, 73, 1, 299520, 0x4f7ca5cf +0, 74, 74, 1, 299520, 0x62951193 +0, 75, 75, 1, 299520, 0xf163d1cb +0, 76, 76, 1, 299520, 0xb995206c +0, 77, 77, 1, 299520, 0xcf5ebaa3 +0, 78, 78, 1, 299520, 0x22fad89d +0, 79, 79, 1, 299520, 0xc9c25e12 +0, 80, 80, 1, 299520, 0xd5404f45 +0, 81, 81, 1, 299520, 0x484bd02d +0, 82, 82, 1, 299520, 0x5790a1c4 +0, 83, 83, 1, 299520, 0xcbec0fed +0, 84, 84, 1, 299520, 0x36bd1758 +0, 85, 85, 1, 299520, 0x4a133700 +0, 86, 86, 1, 299520, 0x2c582b0a +0, 87, 87, 1, 299520, 0xadd773e1 +0, 88, 88, 1, 299520, 0xe4bbced3 +0, 89, 89, 1, 299520, 0x463b3ff0 diff --git a/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2 b/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2 deleted file mode 100644 index bff448b..0000000 --- a/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2 +++ /dev/null @@ -1,5 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 599040, 0x9a8664e6 -0, 1, 1, 1, 599040, 0x72f15982 -0, 2, 2, 1, 599040, 0xc6610a7b -0, 3, 3, 1, 599040, 0x091d3a93 diff --git a/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3 b/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3 new file mode 100644 index 0000000..72a12e8 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3 @@ -0,0 +1,5 @@ +#tb 0: 1/25 +0, 0, 0, 1, 599040, 0x6b61371d +0, 1, 1, 1, 599040, 0xd38a2e50 +0, 2, 2, 1, 599040, 0xe8eb34bd +0, 3, 3, 1, 599040, 0xb3ae6401 diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 new file mode 100644 index 0000000..48ca5ad --- /dev/null +++ b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 @@ -0,0 +1,41 @@ +#tb 0: 1/25 +0, 0, 0, 1, 599040, 0x91d452d5 +0, 1, 1, 1, 599040, 0x1b482509 +0, 2, 2, 1, 599040, 0xbc51425c +0, 3, 3, 1, 599040, 0x5777eeee +0, 4, 4, 1, 599040, 0xe274644d +0, 5, 5, 1, 599040, 0x867450b5 +0, 6, 6, 1, 599040, 0x58708122 +0, 7, 7, 1, 599040, 0xeef17206 +0, 8, 8, 1, 599040, 0x97f4dc1e +0, 9, 9, 1, 599040, 0x92c961cc +0, 10, 10, 1, 599040, 0x1c4ffcb0 +0, 11, 11, 1, 599040, 0xc73e34e6 +0, 12, 12, 1, 599040, 0x1991f1f9 +0, 13, 13, 1, 599040, 0x36e54ba2 +0, 14, 14, 1, 599040, 0x698ce0c6 +0, 15, 15, 1, 599040, 0xc6dd131e +0, 16, 16, 1, 599040, 0x0a22f4c5 +0, 17, 17, 1, 599040, 0xd6a0c196 +0, 18, 18, 1, 599040, 0x699a3e69 +0, 19, 19, 1, 599040, 0x4227009b +0, 20, 20, 1, 599040, 0x1bda8be4 +0, 21, 21, 1, 599040, 0xd1d5dcb4 +0, 22, 22, 1, 599040, 0x00a0249f +0, 23, 23, 1, 599040, 0x7263f7cf +0, 24, 24, 1, 599040, 0x47054be4 +0, 25, 25, 1, 599040, 0xda083f52 +0, 26, 26, 1, 599040, 0xf2906ab1 +0, 27, 27, 1, 599040, 0x20936797 +0, 28, 28, 1, 599040, 0x644d7c3e +0, 29, 29, 1, 599040, 0x7c00e8bf +0, 30, 30, 1, 599040, 0x041f8a48 +0, 31, 31, 1, 599040, 0xcef6e936 +0, 32, 32, 1, 599040, 0x361461e9 +0, 33, 33, 1, 599040, 0xf663ba0a +0, 34, 34, 1, 599040, 0x4d3371d3 +0, 35, 35, 1, 599040, 0xed6b5c92 +0, 36, 36, 1, 599040, 0xdec67f6e +0, 37, 37, 1, 599040, 0xbafa50c0 +0, 38, 38, 1, 599040, 0xc9181637 +0, 39, 39, 1, 599040, 0x95834e17 diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 new file mode 100644 index 0000000..872c5c2 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 @@ -0,0 +1,48 @@ +#tb 0: 1/25 +0, 0, 0, 1, 599040, 0x91d452d5 +0, 1, 1, 1, 599040, 0x1b482509 +0, 2, 2, 1, 599040, 0xbc51425c +0, 3, 3, 1, 599040, 0x5777eeee +0, 4, 4, 1, 599040, 0xe274644d +0, 5, 5, 1, 599040, 0x867450b5 +0, 6, 6, 1, 599040, 0x58708122 +0, 7, 7, 1, 599040, 0xeef17206 +0, 8, 8, 1, 599040, 0x97f4dc1e +0, 9, 9, 1, 599040, 0x92c961cc +0, 10, 10, 1, 599040, 0x1c4ffcb0 +0, 11, 11, 1, 599040, 0xc73e34e6 +0, 12, 12, 1, 599040, 0x1991f1f9 +0, 13, 13, 1, 599040, 0x36e54ba2 +0, 14, 14, 1, 599040, 0x698ce0c6 +0, 15, 15, 1, 599040, 0xc6dd131e +0, 16, 16, 1, 599040, 0x0a22f4c5 +0, 17, 17, 1, 599040, 0xd6a0c196 +0, 18, 18, 1, 599040, 0x699a3e69 +0, 19, 19, 1, 599040, 0x4227009b +0, 20, 20, 1, 599040, 0x1bda8be4 +0, 21, 21, 1, 599040, 0xd1d5dcb4 +0, 22, 22, 1, 599040, 0x00d87745 +0, 23, 23, 1, 599040, 0x9b689b16 +0, 24, 24, 1, 599040, 0x40ae530a +0, 25, 25, 1, 599040, 0x8284f649 +0, 26, 26, 1, 599040, 0x37423ae4 +0, 27, 27, 1, 599040, 0xb3f72b02 +0, 28, 28, 1, 599040, 0xc0cc5860 +0, 29, 29, 1, 599040, 0x00a0249f +0, 30, 30, 1, 599040, 0x7263f7cf +0, 31, 31, 1, 599040, 0x47054be4 +0, 32, 32, 1, 599040, 0xda083f52 +0, 33, 33, 1, 599040, 0xf2906ab1 +0, 34, 34, 1, 599040, 0x20936797 +0, 35, 35, 1, 599040, 0x644d7c3e +0, 36, 36, 1, 599040, 0x7c00e8bf +0, 37, 37, 1, 599040, 0x041f8a48 +0, 38, 38, 1, 599040, 0xcef6e936 +0, 39, 39, 1, 599040, 0x361461e9 +0, 40, 40, 1, 599040, 0xf663ba0a +0, 41, 41, 1, 599040, 0x4d3371d3 +0, 42, 42, 1, 599040, 0xed6b5c92 +0, 43, 43, 1, 599040, 0xdec67f6e +0, 44, 44, 1, 599040, 0xbafa50c0 +0, 45, 45, 1, 599040, 0xc9181637 +0, 46, 46, 1, 599040, 0x95834e17 diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1 new file mode 100644 index 0000000..74849eb --- /dev/null +++ b/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1 @@ -0,0 +1,501 @@ +#tb 0: 1/25 +0, 0, 0, 1, 149760, 0xcfffa013 +0, 1, 1, 1, 149760, 0x8ae80654 +0, 2, 2, 1, 149760, 0xa79915b8 +0, 3, 3, 1, 149760, 0xcc5d4a1e +0, 4, 4, 1, 149760, 0x80636df7 +0, 5, 5, 1, 149760, 0x9cf2c175 +0, 6, 6, 1, 149760, 0xb7c9ecc5 +0, 7, 7, 1, 149760, 0xd038133c +0, 8, 8, 1, 149760, 0x82c62409 +0, 9, 9, 1, 149760, 0xf9ec8f18 +0, 10, 10, 1, 149760, 0x4969ba2d +0, 11, 11, 1, 149760, 0xc4ece232 +0, 12, 12, 1, 149760, 0xc346cab1 +0, 13, 13, 1, 149760, 0xec83e8fd +0, 14, 14, 1, 149760, 0x08e6ee21 +0, 15, 15, 1, 149760, 0x816818ac +0, 16, 16, 1, 149760, 0xc6822627 +0, 17, 17, 1, 149760, 0x2d1d751f +0, 18, 18, 1, 149760, 0xceb8796d +0, 19, 19, 1, 149760, 0xa8919e96 +0, 20, 20, 1, 149760, 0x6fce9abe +0, 21, 21, 1, 149760, 0x66fcbc8b +0, 22, 22, 1, 149760, 0xfc0acbdb +0, 23, 23, 1, 149760, 0x4fa7f7c3 +0, 24, 24, 1, 149760, 0xcc1a00a8 +0, 25, 25, 1, 149760, 0xe3b9aab4 +0, 26, 26, 1, 149760, 0xc064a2a9 +0, 27, 27, 1, 149760, 0x7c29bc1e +0, 28, 28, 1, 149760, 0x54b0a3f2 +0, 29, 29, 1, 149760, 0x4781f75f +0, 30, 30, 1, 149760, 0x3722ec9b +0, 31, 31, 1, 149760, 0xb73fffc8 +0, 32, 32, 1, 149760, 0xd4437e12 +0, 33, 33, 1, 149760, 0xeb8bc09f +0, 34, 34, 1, 149760, 0xe6b0cf24 +0, 35, 35, 1, 149760, 0xffbee400 +0, 36, 36, 1, 149760, 0x71b3d1c2 +0, 37, 37, 1, 149760, 0xeb05fce6 +0, 38, 38, 1, 149760, 0x968a049c +0, 39, 39, 1, 149760, 0xf0b81987 +0, 40, 40, 1, 149760, 0x8ec12318 +0, 41, 41, 1, 149760, 0xb25f6f73 +0, 42, 42, 1, 149760, 0x4d9972ea +0, 43, 43, 1, 149760, 0xb1be9ddd +0, 44, 44, 1, 149760, 0xd8f97724 +0, 45, 45, 1, 149760, 0x88e9a071 +0, 46, 46, 1, 149760, 0xec3a6985 +0, 47, 47, 1, 149760, 0x5eb77758 +0, 48, 48, 1, 149760, 0x7a2d6bc0 +0, 49, 49, 1, 149760, 0x4c108b5a +0, 50, 50, 1, 149760, 0xd1609676 +0, 51, 51, 1, 149760, 0xf497c5f2 +0, 52, 52, 1, 149760, 0x7d52bf67 +0, 53, 53, 1, 149760, 0xa9aeed34 +0, 54, 54, 1, 149760, 0x8a7a03ad +0, 55, 55, 1, 149760, 0x7d6f34ba +0, 56, 56, 1, 149760, 0x3c7a3f33 +0, 57, 57, 1, 149760, 0x220db437 +0, 58, 58, 1, 149760, 0x9098aed1 +0, 59, 59, 1, 149760, 0xba89f864 +0, 60, 60, 1, 149760, 0xc6f0f02a +0, 61, 61, 1, 149760, 0xda71bdce +0, 62, 62, 1, 149760, 0x7532698a +0, 63, 63, 1, 149760, 0x20725283 +0, 64, 64, 1, 149760, 0xd3378be9 +0, 65, 65, 1, 149760, 0x0c449d3b +0, 66, 66, 1, 149760, 0xcb16554e +0, 67, 67, 1, 149760, 0x63bf54fd +0, 68, 68, 1, 149760, 0xc9b8125a +0, 69, 69, 1, 149760, 0x29391d98 +0, 70, 70, 1, 149760, 0xaba92f83 +0, 71, 71, 1, 149760, 0x278360ab +0, 72, 72, 1, 149760, 0x72a17719 +0, 73, 73, 1, 149760, 0xc1057998 +0, 74, 74, 1, 149760, 0x3e3fb884 +0, 75, 75, 1, 149760, 0x4cadfcf5 +0, 76, 76, 1, 149760, 0x265ef61a +0, 77, 77, 1, 149760, 0xc84e8e23 +0, 78, 78, 1, 149760, 0xf23cf3c3 +0, 79, 79, 1, 149760, 0x19280d25 +0, 80, 80, 1, 149760, 0xfc1ed859 +0, 81, 81, 1, 149760, 0x1a4caf70 +0, 82, 82, 1, 149760, 0xcbc3e559 +0, 83, 83, 1, 149760, 0x2284cd25 +0, 84, 84, 1, 149760, 0x4eca841e +0, 85, 85, 1, 149760, 0xc5b2783b +0, 86, 86, 1, 149760, 0x5c07bffe +0, 87, 87, 1, 149760, 0x965b366d +0, 88, 88, 1, 149760, 0x96a87998 +0, 89, 89, 1, 149760, 0x325fb5a8 +0, 90, 90, 1, 149760, 0xfb50de20 +0, 91, 91, 1, 149760, 0x4551ff6f +0, 92, 92, 1, 149760, 0x2c313114 +0, 93, 93, 1, 149760, 0x585fbb08 +0, 94, 94, 1, 149760, 0xab620fbc +0, 95, 95, 1, 149760, 0xac147ed6 +0, 96, 96, 1, 149760, 0x8753dbea +0, 97, 97, 1, 149760, 0x7bd147a4 +0, 98, 98, 1, 149760, 0x09db40f9 +0, 99, 99, 1, 149760, 0x2c1d3e0e +0, 100, 100, 1, 149760, 0xb3678490 +0, 101, 101, 1, 149760, 0xaa1ef03a +0, 102, 102, 1, 149760, 0xaa272a2b +0, 103, 103, 1, 149760, 0x765022ee +0, 104, 104, 1, 149760, 0xa77ae265 +0, 105, 105, 1, 149760, 0xd48ce610 +0, 106, 106, 1, 149760, 0xbbe32786 +0, 107, 107, 1, 149760, 0x2ba067dd +0, 108, 108, 1, 149760, 0x28251c88 +0, 109, 109, 1, 149760, 0xf7073bea +0, 110, 110, 1, 149760, 0x5ada8c9f +0, 111, 111, 1, 149760, 0x0ac5f0c3 +0, 112, 112, 1, 149760, 0x5771b681 +0, 113, 113, 1, 149760, 0x63b1aff4 +0, 114, 114, 1, 149760, 0xe52f1c14 +0, 115, 115, 1, 149760, 0x9fc6a873 +0, 116, 116, 1, 149760, 0xaa7fa136 +0, 117, 117, 1, 149760, 0xea0f1bc3 +0, 118, 118, 1, 149760, 0xb960a92a +0, 119, 119, 1, 149760, 0x8a57440d +0, 120, 120, 1, 149760, 0x0975231e +0, 121, 121, 1, 149760, 0x01f4e2ca +0, 122, 122, 1, 149760, 0x2feba705 +0, 123, 123, 1, 149760, 0xd8c2bb3e +0, 124, 124, 1, 149760, 0x96d8a2a3 +0, 125, 125, 1, 149760, 0xc32ff8d3 +0, 126, 126, 1, 149760, 0x1f8a8edb +0, 127, 127, 1, 149760, 0xc6242875 +0, 128, 128, 1, 149760, 0x3d4df3de +0, 129, 129, 1, 149760, 0x43408010 +0, 130, 130, 1, 149760, 0x2ecd8706 +0, 131, 131, 1, 149760, 0x283c99f9 +0, 132, 132, 1, 149760, 0xa659bde0 +0, 133, 133, 1, 149760, 0x0edc3e70 +0, 134, 134, 1, 149760, 0x9ab3077e +0, 135, 135, 1, 149760, 0x45a2bf0b +0, 136, 136, 1, 149760, 0x67aff7d9 +0, 137, 137, 1, 149760, 0x4395fe6f +0, 138, 138, 1, 149760, 0x84e8ca70 +0, 139, 139, 1, 149760, 0x4089d054 +0, 140, 140, 1, 149760, 0x893bcd2c +0, 141, 141, 1, 149760, 0x36644083 +0, 142, 142, 1, 149760, 0xa0cf4e7d +0, 143, 143, 1, 149760, 0x1ee06750 +0, 144, 144, 1, 149760, 0xef952e66 +0, 145, 145, 1, 149760, 0x7bc3936b +0, 146, 146, 1, 149760, 0x73820f10 +0, 147, 147, 1, 149760, 0xf20e4fa7 +0, 148, 148, 1, 149760, 0xedc2b195 +0, 149, 149, 1, 149760, 0xd5dda892 +0, 150, 150, 1, 149760, 0x065559e4 +0, 151, 151, 1, 149760, 0xd1d1d2f7 +0, 152, 152, 1, 149760, 0x7ea0069e +0, 153, 153, 1, 149760, 0x7eb18a44 +0, 154, 154, 1, 149760, 0x5165627b +0, 155, 155, 1, 149760, 0x2bc02a08 +0, 156, 156, 1, 149760, 0x054f4260 +0, 157, 157, 1, 149760, 0x90206d1a +0, 158, 158, 1, 149760, 0x86a46770 +0, 159, 159, 1, 149760, 0x877956ae +0, 160, 160, 1, 149760, 0xeaee7801 +0, 161, 161, 1, 149760, 0xf5ae2e9d +0, 162, 162, 1, 149760, 0x65ef307b +0, 163, 163, 1, 149760, 0xbcd72d22 +0, 164, 164, 1, 149760, 0x6f5555eb +0, 165, 165, 1, 149760, 0x5c5f43af +0, 166, 166, 1, 149760, 0x13c9fa8e +0, 167, 167, 1, 149760, 0x2236154f +0, 168, 168, 1, 149760, 0x13fdcefc +0, 169, 169, 1, 149760, 0x3e95cea3 +0, 170, 170, 1, 149760, 0x11d73074 +0, 171, 171, 1, 149760, 0x66a68f43 +0, 172, 172, 1, 149760, 0x594ce4d2 +0, 173, 173, 1, 149760, 0xbea4a3de +0, 174, 174, 1, 149760, 0x72258b54 +0, 175, 175, 1, 149760, 0xf7598059 +0, 176, 176, 1, 149760, 0x527b8538 +0, 177, 177, 1, 149760, 0x9150a81a +0, 178, 178, 1, 149760, 0x9c227fd2 +0, 179, 179, 1, 149760, 0x60347245 +0, 180, 180, 1, 149760, 0x3b9f6f64 +0, 181, 181, 1, 149760, 0xd6f37def +0, 182, 182, 1, 149760, 0xa06933dd +0, 183, 183, 1, 149760, 0x19e4ef4d +0, 184, 184, 1, 149760, 0x1fb958cb +0, 185, 185, 1, 149760, 0x3c4e3f19 +0, 186, 186, 1, 149760, 0x98ab1123 +0, 187, 187, 1, 149760, 0x0b4cdf66 +0, 188, 188, 1, 149760, 0x75cd51ef +0, 189, 189, 1, 149760, 0x83e9617d +0, 190, 190, 1, 149760, 0xb97a175b +0, 191, 191, 1, 149760, 0x017520de +0, 192, 192, 1, 149760, 0xa72ecc38 +0, 193, 193, 1, 149760, 0xfb493c45 +0, 194, 194, 1, 149760, 0x6c8e40b4 +0, 195, 195, 1, 149760, 0x4aa6672c +0, 196, 196, 1, 149760, 0x223f68e5 +0, 197, 197, 1, 149760, 0x6257d660 +0, 198, 198, 1, 149760, 0xade0f8af +0, 199, 199, 1, 149760, 0x8543652c +0, 200, 200, 1, 149760, 0x593b7957 +0, 201, 201, 1, 149760, 0x90ce1910 +0, 202, 202, 1, 149760, 0x3d617a3f +0, 203, 203, 1, 149760, 0x9336fbc0 +0, 204, 204, 1, 149760, 0x26f1387b +0, 205, 205, 1, 149760, 0x0273a944 +0, 206, 206, 1, 149760, 0x71b9b110 +0, 207, 207, 1, 149760, 0x123fee6d +0, 208, 208, 1, 149760, 0xc4bde65b +0, 209, 209, 1, 149760, 0x646e3a45 +0, 210, 210, 1, 149760, 0x987e6024 +0, 211, 211, 1, 149760, 0x0bf6c9d4 +0, 212, 212, 1, 149760, 0x20d6e1cf +0, 213, 213, 1, 149760, 0x5e0931df +0, 214, 214, 1, 149760, 0xd96e313c +0, 215, 215, 1, 149760, 0x04bbfcc5 +0, 216, 216, 1, 149760, 0xa764de56 +0, 217, 217, 1, 149760, 0x1e584d95 +0, 218, 218, 1, 149760, 0x1779f283 +0, 219, 219, 1, 149760, 0xfaefbc07 +0, 220, 220, 1, 149760, 0x2e9b4e2b +0, 221, 221, 1, 149760, 0xeb6e3a42 +0, 222, 222, 1, 149760, 0xd2cbe3d4 +0, 223, 223, 1, 149760, 0xb9c4cf8c +0, 224, 224, 1, 149760, 0x167b5401 +0, 225, 225, 1, 149760, 0x37846b87 +0, 226, 226, 1, 149760, 0xd0d66b7c +0, 227, 227, 1, 149760, 0x4d61970e +0, 228, 228, 1, 149760, 0x987cbc29 +0, 229, 229, 1, 149760, 0x3fa00111 +0, 230, 230, 1, 149760, 0x42ba262f +0, 231, 231, 1, 149760, 0x9d40660b +0, 232, 232, 1, 149760, 0x3b678b28 +0, 233, 233, 1, 149760, 0x3c72d081 +0, 234, 234, 1, 149760, 0xd8ad0056 +0, 235, 235, 1, 149760, 0x86052268 +0, 236, 236, 1, 149760, 0x8ac3f213 +0, 237, 237, 1, 149760, 0xe2cfb6fb +0, 238, 238, 1, 149760, 0x412b5544 +0, 239, 239, 1, 149760, 0x468d2f6d +0, 240, 240, 1, 149760, 0x63f5e9d0 +0, 241, 241, 1, 149760, 0x4318f07d +0, 242, 242, 1, 149760, 0xa0c7b7df +0, 243, 243, 1, 149760, 0x8ad37f38 +0, 244, 244, 1, 149760, 0xa6101620 +0, 245, 245, 1, 149760, 0x02b3d774 +0, 246, 246, 1, 149760, 0x541a6c86 +0, 247, 247, 1, 149760, 0xe11148f0 +0, 248, 248, 1, 149760, 0x4a920c7e +0, 249, 249, 1, 149760, 0x878104a9 +0, 250, 250, 1, 149760, 0xbb65dfda +0, 251, 251, 1, 149760, 0xda02bd47 +0, 252, 252, 1, 149760, 0xe0529fd7 +0, 253, 253, 1, 149760, 0x52619028 +0, 254, 254, 1, 149760, 0x4e9c9f32 +0, 255, 255, 1, 149760, 0x9ae49e70 +0, 256, 256, 1, 149760, 0x851e84de +0, 257, 257, 1, 149760, 0x1709a3cd +0, 258, 258, 1, 149760, 0x3dace2eb +0, 259, 259, 1, 149760, 0x46fe3ebf +0, 260, 260, 1, 149760, 0xea53610c +0, 261, 261, 1, 149760, 0x0df3415f +0, 262, 262, 1, 149760, 0x29c57eec +0, 263, 263, 1, 149760, 0x1ed3a882 +0, 264, 264, 1, 149760, 0xf3047aed +0, 265, 265, 1, 149760, 0x7a7d08cd +0, 266, 266, 1, 149760, 0xc69dd2ad +0, 267, 267, 1, 149760, 0x94d1c233 +0, 268, 268, 1, 149760, 0x21d7eab9 +0, 269, 269, 1, 149760, 0xd8755fda +0, 270, 270, 1, 149760, 0xa44fbf4a +0, 271, 271, 1, 149760, 0x624d42cb +0, 272, 272, 1, 149760, 0xf462482d +0, 273, 273, 1, 149760, 0x8dd0641d +0, 274, 274, 1, 149760, 0x9349bc12 +0, 275, 275, 1, 149760, 0x0488137f +0, 276, 276, 1, 149760, 0x8088d83e +0, 277, 277, 1, 149760, 0x051895e4 +0, 278, 278, 1, 149760, 0x0cc16c74 +0, 279, 279, 1, 149760, 0xcdc62942 +0, 280, 280, 1, 149760, 0x6d1392aa +0, 281, 281, 1, 149760, 0x61e2e1da +0, 282, 282, 1, 149760, 0x5cb06ae9 +0, 283, 283, 1, 149760, 0x5110b773 +0, 284, 284, 1, 149760, 0x050db1cb +0, 285, 285, 1, 149760, 0x353dfc85 +0, 286, 286, 1, 149760, 0x96ac57f2 +0, 287, 287, 1, 149760, 0x7e925578 +0, 288, 288, 1, 149760, 0x4eaa64c0 +0, 289, 289, 1, 149760, 0x10b6d8cf +0, 290, 290, 1, 149760, 0x645317c2 +0, 291, 291, 1, 149760, 0xcf60e8e2 +0, 292, 292, 1, 149760, 0x38dc8503 +0, 293, 293, 1, 149760, 0xf88bd43b +0, 294, 294, 1, 149760, 0x284b675e +0, 295, 295, 1, 149760, 0xba9ac819 +0, 296, 296, 1, 149760, 0xd913bba8 +0, 297, 297, 1, 149760, 0x50612c15 +0, 298, 298, 1, 149760, 0x8ec14fb1 +0, 299, 299, 1, 149760, 0x2dd30b7d +0, 300, 300, 1, 149760, 0x5a3f52cf +0, 301, 301, 1, 149760, 0x95169561 +0, 302, 302, 1, 149760, 0x6ede7115 +0, 303, 303, 1, 149760, 0x70e435e0 +0, 304, 304, 1, 149760, 0x496df85a +0, 305, 305, 1, 149760, 0xdd583698 +0, 306, 306, 1, 149760, 0xee46c909 +0, 307, 307, 1, 149760, 0x4b0632ed +0, 308, 308, 1, 149760, 0x744e4d23 +0, 309, 309, 1, 149760, 0xc72d8111 +0, 310, 310, 1, 149760, 0x6d6c62d4 +0, 311, 311, 1, 149760, 0xbc39103c +0, 312, 312, 1, 149760, 0x1b0548e5 +0, 313, 313, 1, 149760, 0xac760971 +0, 314, 314, 1, 149760, 0x0bbfeab1 +0, 315, 315, 1, 149760, 0x843ca731 +0, 316, 316, 1, 149760, 0x6a8dd5c9 +0, 317, 317, 1, 149760, 0xd5e19d6e +0, 318, 318, 1, 149760, 0xde1e9259 +0, 319, 319, 1, 149760, 0xa9c6aecf +0, 320, 320, 1, 149760, 0x4e3c1463 +0, 321, 321, 1, 149760, 0x20e95cd5 +0, 322, 322, 1, 149760, 0x26b9c119 +0, 323, 323, 1, 149760, 0x0284eab3 +0, 324, 324, 1, 149760, 0x128544f3 +0, 325, 325, 1, 149760, 0x5c33579c +0, 326, 326, 1, 149760, 0x58e48fc1 +0, 327, 327, 1, 149760, 0x46d20ba5 +0, 328, 328, 1, 149760, 0x232478d4 +0, 329, 329, 1, 149760, 0x4299f014 +0, 330, 330, 1, 149760, 0x68e08339 +0, 331, 331, 1, 149760, 0x01c0ca97 +0, 332, 332, 1, 149760, 0xad7071d6 +0, 333, 333, 1, 149760, 0xa1efff2e +0, 334, 334, 1, 149760, 0xe788aa06 +0, 335, 335, 1, 149760, 0xa203d648 +0, 336, 336, 1, 149760, 0xdec84349 +0, 337, 337, 1, 149760, 0xb15fc868 +0, 338, 338, 1, 149760, 0x6ca04511 +0, 339, 339, 1, 149760, 0xc4b95d7e +0, 340, 340, 1, 149760, 0xa3d0d178 +0, 341, 341, 1, 149760, 0xb4835e5f +0, 342, 342, 1, 149760, 0xcff22407 +0, 343, 343, 1, 149760, 0x8259ad5a +0, 344, 344, 1, 149760, 0x9cb2f71a +0, 345, 345, 1, 149760, 0xf2d3cae6 +0, 346, 346, 1, 149760, 0xbdaa58c5 +0, 347, 347, 1, 149760, 0x2c0ec9bd +0, 348, 348, 1, 149760, 0x63357b56 +0, 349, 349, 1, 149760, 0xc92b5672 +0, 350, 350, 1, 149760, 0xc2deae0d +0, 351, 351, 1, 149760, 0x111a214d +0, 352, 352, 1, 149760, 0xbb7a0383 +0, 353, 353, 1, 149760, 0x31b6d2ad +0, 354, 354, 1, 149760, 0x87f8b103 +0, 355, 355, 1, 149760, 0xd035ede8 +0, 356, 356, 1, 149760, 0xf021cb64 +0, 357, 357, 1, 149760, 0x18a1c19c +0, 358, 358, 1, 149760, 0xc51980ac +0, 359, 359, 1, 149760, 0x2394c13e +0, 360, 360, 1, 149760, 0x2b27c7ee +0, 361, 361, 1, 149760, 0x40e0670f +0, 362, 362, 1, 149760, 0xbc0f3989 +0, 363, 363, 1, 149760, 0x391048d6 +0, 364, 364, 1, 149760, 0x1bc0e92c +0, 365, 365, 1, 149760, 0xa7e278d9 +0, 366, 366, 1, 149760, 0xb4123421 +0, 367, 367, 1, 149760, 0x106bb0e1 +0, 368, 368, 1, 149760, 0x4c2a61d2 +0, 369, 369, 1, 149760, 0x69aaee6e +0, 370, 370, 1, 149760, 0x925e5432 +0, 371, 371, 1, 149760, 0x06d6d786 +0, 372, 372, 1, 149760, 0xd431fba8 +0, 373, 373, 1, 149760, 0x54092812 +0, 374, 374, 1, 149760, 0xb8e10742 +0, 375, 375, 1, 149760, 0x2ee782d3 +0, 376, 376, 1, 149760, 0x210ff556 +0, 377, 377, 1, 149760, 0xa41cf41e +0, 378, 378, 1, 149760, 0xbe852e5a +0, 379, 379, 1, 149760, 0x4a89b5c5 +0, 380, 380, 1, 149760, 0xe44408d1 +0, 381, 381, 1, 149760, 0x503197f3 +0, 382, 382, 1, 149760, 0x686bf74e +0, 383, 383, 1, 149760, 0xb96fd46b +0, 384, 384, 1, 149760, 0x9a926a62 +0, 385, 385, 1, 149760, 0x97cf58e9 +0, 386, 386, 1, 149760, 0x0e7840af +0, 387, 387, 1, 149760, 0x00aa85e9 +0, 388, 388, 1, 149760, 0x24c4fd96 +0, 389, 389, 1, 149760, 0xe520844b +0, 390, 390, 1, 149760, 0xd4755d80 +0, 391, 391, 1, 149760, 0x9cd4b85c +0, 392, 392, 1, 149760, 0xd01aa4ad +0, 393, 393, 1, 149760, 0xa5479aa5 +0, 394, 394, 1, 149760, 0x74c066d4 +0, 395, 395, 1, 149760, 0xe1a35a46 +0, 396, 396, 1, 149760, 0x714aeafb +0, 397, 397, 1, 149760, 0xb3e0f80e +0, 398, 398, 1, 149760, 0x99663804 +0, 399, 399, 1, 149760, 0x3a40a623 +0, 400, 400, 1, 149760, 0x91b4d995 +0, 401, 401, 1, 149760, 0x6edd8a1f +0, 402, 402, 1, 149760, 0x1f763e9a +0, 403, 403, 1, 149760, 0x932b79d4 +0, 404, 404, 1, 149760, 0x6a1a9755 +0, 405, 405, 1, 149760, 0x403562c8 +0, 406, 406, 1, 149760, 0x6486231b +0, 407, 407, 1, 149760, 0x3c2bfb98 +0, 408, 408, 1, 149760, 0x198a3cee +0, 409, 409, 1, 149760, 0x4d2f7817 +0, 410, 410, 1, 149760, 0xd7b189a7 +0, 411, 411, 1, 149760, 0x9ad0ba76 +0, 412, 412, 1, 149760, 0xea8d8859 +0, 413, 413, 1, 149760, 0x30fae052 +0, 414, 414, 1, 149760, 0x55b1763c +0, 415, 415, 1, 149760, 0x4be39b5b +0, 416, 416, 1, 149760, 0xec332a7f +0, 417, 417, 1, 149760, 0x226f7c74 +0, 418, 418, 1, 149760, 0x0a82fa19 +0, 419, 419, 1, 149760, 0x8bb5ca7d +0, 420, 420, 1, 149760, 0xe59f21e1 +0, 421, 421, 1, 149760, 0x20450c0b +0, 422, 422, 1, 149760, 0xd9fcc726 +0, 423, 423, 1, 149760, 0xf4e9a639 +0, 424, 424, 1, 149760, 0x932602d1 +0, 425, 425, 1, 149760, 0xcdfdb2c6 +0, 426, 426, 1, 149760, 0xc91929b2 +0, 427, 427, 1, 149760, 0x6b24081c +0, 428, 428, 1, 149760, 0xa2e00bd5 +0, 429, 429, 1, 149760, 0x7536baea +0, 430, 430, 1, 149760, 0x5a4279b7 +0, 431, 431, 1, 149760, 0x48741fb4 +0, 432, 432, 1, 149760, 0xe0a71c39 +0, 433, 433, 1, 149760, 0x4422b4cf +0, 434, 434, 1, 149760, 0x3ddc7752 +0, 435, 435, 1, 149760, 0x209ebb6b +0, 436, 436, 1, 149760, 0x47cc746f +0, 437, 437, 1, 149760, 0x159f56a4 +0, 438, 438, 1, 149760, 0x22e39511 +0, 439, 439, 1, 149760, 0x78698fbd +0, 440, 440, 1, 149760, 0x7bc88f86 +0, 441, 441, 1, 149760, 0x44a423d1 +0, 442, 442, 1, 149760, 0x25fadf02 +0, 443, 443, 1, 149760, 0xd360cfee +0, 444, 444, 1, 149760, 0xcd6c409f +0, 445, 445, 1, 149760, 0xd5905aca +0, 446, 446, 1, 149760, 0x621f3edc +0, 447, 447, 1, 149760, 0x79bd347e +0, 448, 448, 1, 149760, 0xdb9d163d +0, 449, 449, 1, 149760, 0x7282e4d6 +0, 450, 450, 1, 149760, 0x8d6dc686 +0, 451, 451, 1, 149760, 0x35132151 +0, 452, 452, 1, 149760, 0x27a05c87 +0, 453, 453, 1, 149760, 0x8e12df27 +0, 454, 454, 1, 149760, 0xf2fb72cd +0, 455, 455, 1, 149760, 0xea71796e +0, 456, 456, 1, 149760, 0xbd2ffeec +0, 457, 457, 1, 149760, 0xdb849b70 +0, 458, 458, 1, 149760, 0xc8193666 +0, 459, 459, 1, 149760, 0x7dab4b05 +0, 460, 460, 1, 149760, 0x83a94327 +0, 461, 461, 1, 149760, 0x56a2ca36 +0, 462, 462, 1, 149760, 0x7d20c938 +0, 463, 463, 1, 149760, 0xfbbfa0bd +0, 464, 464, 1, 149760, 0xea020d13 +0, 465, 465, 1, 149760, 0x2ef8c012 +0, 466, 466, 1, 149760, 0x36a10f18 +0, 467, 467, 1, 149760, 0x56e538e3 +0, 468, 468, 1, 149760, 0xf98d9ca8 +0, 469, 469, 1, 149760, 0xeba06818 +0, 470, 470, 1, 149760, 0x7d9c6f79 +0, 471, 471, 1, 149760, 0xd7173a90 +0, 472, 472, 1, 149760, 0xff4ced8d +0, 473, 473, 1, 149760, 0xe7d92ff8 +0, 474, 474, 1, 149760, 0x4f020382 +0, 475, 475, 1, 149760, 0x4e93292a +0, 476, 476, 1, 149760, 0x08dc52c7 +0, 477, 477, 1, 149760, 0xbff9557e +0, 478, 478, 1, 149760, 0x1caa8bc5 +0, 479, 479, 1, 149760, 0x9b7aaf9a +0, 480, 480, 1, 149760, 0x2cb89025 +0, 481, 481, 1, 149760, 0x18e2a4ad +0, 482, 482, 1, 149760, 0xf50dce5e +0, 483, 483, 1, 149760, 0x9f87c44f +0, 484, 484, 1, 149760, 0xbfdc521d +0, 485, 485, 1, 149760, 0xa06f5b06 +0, 486, 486, 1, 149760, 0xa169a6fe +0, 487, 487, 1, 149760, 0xce6280d4 +0, 488, 488, 1, 149760, 0x056c21d6 +0, 489, 489, 1, 149760, 0x70b068df +0, 490, 490, 1, 149760, 0x1097459b +0, 491, 491, 1, 149760, 0xef1925f1 +0, 492, 492, 1, 149760, 0x6969b893 +0, 493, 493, 1, 149760, 0x0203fc33 +0, 494, 494, 1, 149760, 0x812e46b9 +0, 495, 495, 1, 149760, 0x7379207f +0, 496, 496, 1, 149760, 0xff11e733 +0, 497, 497, 1, 149760, 0xc5af45a8 +0, 498, 498, 1, 149760, 0x3ec6b250 +0, 499, 499, 1, 149760, 0xb90ddf3a diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 new file mode 100644 index 0000000..55e4be0 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 @@ -0,0 +1,99 @@ +#tb 0: 1/25 +0, 0, 0, 1, 599040, 0x4246702a +0, 1, 1, 1, 599040, 0x25e02747 +0, 2, 2, 1, 599040, 0x0894b9de +0, 3, 3, 1, 599040, 0x88ea9524 +0, 4, 4, 1, 599040, 0xaff26463 +0, 5, 5, 1, 599040, 0x5fb75697 +0, 6, 6, 1, 599040, 0xbc2f36a3 +0, 7, 7, 1, 599040, 0xb7823c25 +0, 8, 8, 1, 599040, 0x61cb05cb +0, 9, 9, 1, 599040, 0x74bfcc5c +0, 10, 10, 1, 599040, 0x435c4cb3 +0, 11, 11, 1, 599040, 0x34e1a6df +0, 12, 12, 1, 599040, 0x57760c47 +0, 13, 13, 1, 599040, 0xd8c5092c +0, 14, 14, 1, 599040, 0x56d4aeed +0, 15, 15, 1, 599040, 0xda4388c2 +0, 16, 16, 1, 599040, 0x09c82870 +0, 17, 17, 1, 599040, 0x77f63854 +0, 18, 18, 1, 599040, 0xb7ca000b +0, 19, 19, 1, 599040, 0x6ef162db +0, 20, 20, 1, 599040, 0x1a274bec +0, 21, 21, 1, 599040, 0x1a839505 +0, 22, 22, 1, 599040, 0xf78f0c03 +0, 23, 23, 1, 599040, 0x3d395229 +0, 24, 24, 1, 599040, 0x9494b5ac +0, 25, 25, 1, 599040, 0x42560d96 +0, 26, 26, 1, 599040, 0x135f76d8 +0, 27, 27, 1, 599040, 0x3758c2ab +0, 28, 28, 1, 599040, 0x100fb1d8 +0, 29, 29, 1, 599040, 0x9273f18e +0, 30, 30, 1, 599040, 0x41b31734 +0, 31, 31, 1, 599040, 0xb2e140b7 +0, 32, 32, 1, 599040, 0xd35f3451 +0, 33, 33, 1, 599040, 0x6198a3d6 +0, 34, 34, 1, 599040, 0x0253e3fa +0, 35, 35, 1, 599040, 0x421a1cd1 +0, 36, 36, 1, 599040, 0xd2152e6b +0, 37, 37, 1, 599040, 0xe4c37cc7 +0, 38, 38, 1, 599040, 0xec3393c3 +0, 39, 39, 1, 599040, 0x1fe16574 +0, 40, 40, 1, 599040, 0xa3a8c14d +0, 41, 41, 1, 599040, 0x32eb90aa +0, 42, 42, 1, 599040, 0xebca8310 +0, 43, 43, 1, 599040, 0x7888627f +0, 44, 44, 1, 599040, 0xe048335c +0, 45, 45, 1, 599040, 0xe2262b9c +0, 46, 46, 1, 599040, 0xb8c2b115 +0, 47, 47, 1, 599040, 0x2ff4194b +0, 48, 48, 1, 599040, 0x3a9b5520 +0, 49, 49, 1, 599040, 0xbd8c0486 +0, 50, 50, 1, 599040, 0xc8b8f29e +0, 51, 51, 1, 599040, 0xbc12f62c +0, 52, 52, 1, 599040, 0x04bb6438 +0, 53, 53, 1, 599040, 0x07971646 +0, 54, 54, 1, 599040, 0x0193dabe +0, 55, 55, 1, 599040, 0x20f41d9e +0, 56, 56, 1, 599040, 0x04b40718 +0, 57, 57, 1, 599040, 0x75d2c51c +0, 58, 58, 1, 599040, 0x9b8c2c50 +0, 59, 59, 1, 599040, 0x970e39ea +0, 60, 60, 1, 599040, 0x7c4264aa +0, 61, 61, 1, 599040, 0xe939a6fd +0, 62, 62, 1, 599040, 0xc8b95f8d +0, 63, 63, 1, 599040, 0x9e2f384a +0, 64, 64, 1, 599040, 0x7dc74724 +0, 65, 65, 1, 599040, 0x7e93bc5f +0, 66, 66, 1, 599040, 0x99b2c09d +0, 67, 67, 1, 599040, 0x284e436f +0, 68, 68, 1, 599040, 0xaa303eee +0, 69, 69, 1, 599040, 0x65e54342 +0, 70, 70, 1, 599040, 0x2fe183cd +0, 71, 71, 1, 599040, 0x5953c191 +0, 72, 72, 1, 599040, 0x0fc9a701 +0, 73, 73, 1, 599040, 0x0eea5327 +0, 74, 74, 1, 599040, 0x118752f1 +0, 75, 75, 1, 599040, 0x778c7711 +0, 76, 76, 1, 599040, 0x6f3ad6a5 +0, 77, 77, 1, 599040, 0xf70fcd3d +0, 78, 78, 1, 599040, 0x85a366cb +0, 79, 79, 1, 599040, 0xdda47432 +0, 80, 80, 1, 599040, 0x86379004 +0, 81, 81, 1, 599040, 0xfc539512 +0, 82, 82, 1, 599040, 0x04e70786 +0, 83, 83, 1, 599040, 0x7dddc8f7 +0, 84, 84, 1, 599040, 0xa76a3b6e +0, 85, 85, 1, 599040, 0x44183060 +0, 86, 86, 1, 599040, 0x6f691c5a +0, 87, 87, 1, 599040, 0x39d25e12 +0, 88, 88, 1, 599040, 0xfe3aad0d +0, 89, 89, 1, 599040, 0x57f76928 +0, 90, 90, 1, 599040, 0x4e68eed5 +0, 91, 91, 1, 599040, 0x3a589d50 +0, 92, 92, 1, 599040, 0x92ec69b8 +0, 93, 93, 1, 599040, 0x9f78926e +0, 94, 94, 1, 599040, 0xa1ca1b1d +0, 95, 95, 1, 599040, 0x140240eb +0, 96, 96, 1, 599040, 0x61fa01af +0, 97, 97, 1, 599040, 0x79f9e3ae diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 new file mode 100644 index 0000000..e45005f --- /dev/null +++ b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 @@ -0,0 +1,97 @@ +#tb 0: 1/25 +0, 0, 0, 1, 599040, 0x91d452d5 +0, 1, 1, 1, 599040, 0x1b482509 +0, 2, 2, 1, 599040, 0xbc51425c +0, 3, 3, 1, 599040, 0x5777eeee +0, 4, 4, 1, 599040, 0xe274644d +0, 5, 5, 1, 599040, 0x867450b5 +0, 6, 6, 1, 599040, 0x58708122 +0, 7, 7, 1, 599040, 0xeef17206 +0, 8, 8, 1, 599040, 0x97f4dc1e +0, 9, 9, 1, 599040, 0x92c961cc +0, 10, 10, 1, 599040, 0x1c4ffcb0 +0, 11, 11, 1, 599040, 0xc73e34e6 +0, 12, 12, 1, 599040, 0x1991f1f9 +0, 13, 13, 1, 599040, 0x36e54ba2 +0, 14, 14, 1, 599040, 0x698ce0c6 +0, 15, 15, 1, 599040, 0xc6dd131e +0, 16, 16, 1, 599040, 0x0a22f4c5 +0, 17, 17, 1, 599040, 0xd6a0c196 +0, 18, 18, 1, 599040, 0x699a3e69 +0, 19, 19, 1, 599040, 0x4227009b +0, 20, 20, 1, 599040, 0xd1d5dcb4 +0, 21, 21, 1, 599040, 0x58b2edb3 +0, 22, 22, 1, 599040, 0xd1f795d8 +0, 23, 23, 1, 599040, 0x3331d5e6 +0, 24, 24, 1, 599040, 0x5e5ec2c9 +0, 25, 25, 1, 599040, 0x3b907bf5 +0, 26, 26, 1, 599040, 0xefcbf471 +0, 27, 27, 1, 599040, 0x2769a578 +0, 28, 28, 1, 599040, 0x812ce986 +0, 29, 29, 1, 599040, 0xf07c212c +0, 30, 30, 1, 599040, 0x00a0249f +0, 31, 31, 1, 599040, 0x7263f7cf +0, 32, 32, 1, 599040, 0x47054be4 +0, 33, 33, 1, 599040, 0xda083f52 +0, 34, 34, 1, 599040, 0xf2906ab1 +0, 35, 35, 1, 599040, 0x20936797 +0, 36, 36, 1, 599040, 0x644d7c3e +0, 37, 37, 1, 599040, 0x7c00e8bf +0, 38, 38, 1, 599040, 0x041f8a48 +0, 39, 39, 1, 599040, 0xcef6e936 +0, 40, 40, 1, 599040, 0x361461e9 +0, 41, 41, 1, 599040, 0xf663ba0a +0, 42, 42, 1, 599040, 0x4d3371d3 +0, 43, 43, 1, 599040, 0xed6b5c92 +0, 44, 44, 1, 599040, 0xdec67f6e +0, 45, 45, 1, 599040, 0xbafa50c0 +0, 46, 46, 1, 599040, 0xc9181637 +0, 47, 47, 1, 599040, 0x29eadcac +0, 48, 48, 1, 599040, 0xb258430f +0, 49, 49, 1, 599040, 0x49dc8716 +0, 50, 50, 1, 599040, 0x80b0a3b3 +0, 51, 51, 1, 599040, 0x5d8275a7 +0, 52, 52, 1, 599040, 0xe236242d +0, 53, 53, 1, 599040, 0x3e14bb43 +0, 54, 54, 1, 599040, 0x20e6e2d7 +0, 55, 55, 1, 599040, 0x19cad4ee +0, 56, 56, 1, 599040, 0x13fd16f1 +0, 57, 57, 1, 599040, 0x98e56b95 +0, 58, 58, 1, 599040, 0x028e4c6a +0, 59, 59, 1, 599040, 0x5bd1131d +0, 60, 60, 1, 599040, 0x0afe3873 +0, 61, 61, 1, 599040, 0xea93e425 +0, 62, 62, 1, 599040, 0xeb301be1 +0, 63, 63, 1, 599040, 0x443ca0a3 +0, 64, 64, 1, 599040, 0xb68b40a1 +0, 65, 65, 1, 599040, 0xf58f75b9 +0, 66, 66, 1, 599040, 0xefa27c52 +0, 67, 67, 1, 599040, 0xac676fa5 +0, 68, 68, 1, 599040, 0x688d1582 +0, 69, 69, 1, 599040, 0x9067a4ef +0, 70, 70, 1, 599040, 0xdc753d6c +0, 71, 71, 1, 599040, 0x6f6da304 +0, 72, 72, 1, 599040, 0xa7606f97 +0, 73, 73, 1, 599040, 0xb53c8c18 +0, 74, 74, 1, 599040, 0x3572d550 +0, 75, 75, 1, 599040, 0x123d5423 +0, 76, 76, 1, 599040, 0x89f11e50 +0, 77, 77, 1, 599040, 0x702649cc +0, 78, 78, 1, 599040, 0x2b4767c4 +0, 79, 79, 1, 599040, 0xf18b9628 +0, 80, 80, 1, 599040, 0x1ef72a6b +0, 81, 81, 1, 599040, 0x0a8c9641 +0, 82, 82, 1, 599040, 0xf2fa0233 +0, 83, 83, 1, 599040, 0x99385e51 +0, 84, 84, 1, 599040, 0x77b413cf +0, 85, 85, 1, 599040, 0x6360c9e3 +0, 86, 86, 1, 599040, 0xe216b383 +0, 87, 87, 1, 599040, 0x54df8826 +0, 88, 88, 1, 599040, 0x6691e1ee +0, 89, 89, 1, 599040, 0x37bebd20 +0, 90, 90, 1, 599040, 0xf05184e4 +0, 91, 91, 1, 599040, 0xbd7fab4f +0, 92, 92, 1, 599040, 0x70211cdc +0, 93, 93, 1, 599040, 0x4f4c375b +0, 94, 94, 1, 599040, 0x2d645b5a +0, 95, 95, 1, 599040, 0x475d263f

1 0

Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Apr 30 21:43:53 2014 +0200| [a1ac27bc6639792c5ace89add806fd6966e1a84f] | committer: Michael Niedermayer Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb' * commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb': librtmp: Map native options to librtmp ones when possible Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1ac27bc6639792c5… ---

1 0

librtmp: Map native options to librtmp ones when possible
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sat Apr 26 13:32:03 2014 +0200| [7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb] | committer: Luca Barbato librtmp: Map native options to librtmp ones when possible Makes the two protocols nearly seamless. Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d027b9d6d6290557… --- libavformat/librtmp.c | 141 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 126 insertions(+), 15 deletions(-) diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c index 7133bd6..aa5bd42 100644 --- a/libavformat/librtmp.c +++ b/libavformat/librtmp.c @@ -37,7 +37,16 @@ typedef struct LibRTMPContext { const AVClass *class; RTMP rtmp; char *app; + char *conn; + char *subscribe; char *playpath; + char *tcurl; + char *flashver; + char *swfurl; + char *swfverify; + char *pageurl; + char *client_buffer_time; + int live; } LibRTMPContext; static void rtmp_log(int level, const char *fmt, va_list args) @@ -83,6 +92,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) RTMP *r = &ctx->rtmp; int rc = 0, level; char *filename = s->filename; + int len = strlen(s->filename) + 1; switch (av_log_get_level()) { default: @@ -96,22 +106,111 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) RTMP_LogSetLevel(level); RTMP_LogSetCallback(rtmp_log); - if (ctx->app || ctx->playpath) { - int len = strlen(s->filename) + 1; - if (ctx->app) len += strlen(ctx->app) + sizeof(" app="); - if (ctx->playpath) len += strlen(ctx->playpath) + sizeof(" playpath="); + if (ctx->app) len += strlen(ctx->app) + sizeof(" app="); + if (ctx->tcurl) len += strlen(ctx->tcurl) + sizeof(" tcUrl="); + if (ctx->pageurl) len += strlen(ctx->pageurl) + sizeof(" pageUrl="); + if (ctx->flashver) len += strlen(ctx->flashver) + sizeof(" flashver="); + + if (ctx->conn) { + char *sep, *p = ctx->conn; + int options = 0; + + while (p) { + options++; + p += strspn(p, " "); + if (!*p) + break; + sep = strchr(p, ' '); + if (sep) + p = sep + 1; + else + break; + } + len += options * sizeof(" conn="); + len += strlen(ctx->conn); + } + + if (ctx->playpath) + len += strlen(ctx->playpath) + sizeof(" playpath="); + if (ctx->live) + len += sizeof(" live=1"); + if (ctx->subscribe) + len += strlen(ctx->subscribe) + sizeof(" subscribe="); + + if (ctx->client_buffer_time) + len += strlen(ctx->client_buffer_time) + sizeof(" buffer="); - if (!(filename = av_malloc(len))) - return AVERROR(ENOMEM); + if (ctx->swfurl || ctx->swfverify) { + len += sizeof(" swfUrl="); - av_strlcpy(filename, s->filename, len); - if (ctx->app) { - av_strlcat(filename, " app=", len); - av_strlcat(filename, ctx->app, len); + if (ctx->swfverify) + len += strlen(ctx->swfverify) + sizeof(" swfVfy=1"); + else + len += strlen(ctx->swfurl); + } + + if (!(filename = av_malloc(len))) + return AVERROR(ENOMEM); + + av_strlcpy(filename, s->filename, len); + if (ctx->app) { + av_strlcat(filename, " app=", len); + av_strlcat(filename, ctx->app, len); + } + if (ctx->tcurl) { + av_strlcat(filename, " tcUrl=", len); + av_strlcat(filename, ctx->tcurl, len); + } + if (ctx->pageurl) { + av_strlcat(filename, " pageUrl=", len); + av_strlcat(filename, ctx->pageurl, len); + } + if (ctx->swfurl) { + av_strlcat(filename, " swfUrl=", len); + av_strlcat(filename, ctx->pageurl, len); + } + if (ctx->flashver) { + av_strlcat(filename, " flashVer=", len); + av_strlcat(filename, ctx->flashver, len); + } + if (ctx->conn) { + char *sep, *p = ctx->conn; + while (p) { + av_strlcat(filename, " conn=", len); + p += strspn(p, " "); + if (!*p) + break; + sep = strchr(p, ' '); + if (sep) + *sep = '\0'; + av_strlcat(filename, p, len); + + if (sep) + p = sep + 1; } - if (ctx->playpath) { - av_strlcat(filename, " playpath=", len); - av_strlcat(filename, ctx->playpath, len); + } + if (ctx->playpath) { + av_strlcat(filename, " playpath=", len); + av_strlcat(filename, ctx->playpath, len); + } + if (ctx->live) + av_strlcat(filename, " live=1", len); + if (ctx->subscribe) { + av_strlcat(filename, " subscribe=", len); + av_strlcat(filename, ctx->subscribe, len); + } + if (ctx->client_buffer_time) { + av_strlcat(filename, " buffer=", len); + av_strlcat(filename, ctx->client_buffer_time, len); + } + if (ctx->swfurl || ctx->swfverify) { + av_strlcat(filename, " swfUrl=", len); + + if (ctx->swfverify) { + av_strlcat(filename, ctx->swfverify, len); + av_strlcat(filename, " swfVfy=1", len); + } else { + av_strlcat(filename, ctx->swfurl, len); } } @@ -194,8 +293,20 @@ static int rtmp_get_file_handle(URLContext *s) #define DEC AV_OPT_FLAG_DECODING_PARAM #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - {"rtmp_app", "Name of application to connect to on the RTMP server", OFFSET(app), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, - {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_app", "Name of application to connect to on the RTMP server", OFFSET(app), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_buffer", "Set buffer time in milliseconds. The default is 3000.", OFFSET(client_buffer_time), AV_OPT_TYPE_STRING, {.str = "3000"}, 0, 0, DEC|ENC}, + {"rtmp_conn", "Append arbitrary AMF data to the Connect message", OFFSET(conn), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_flashver", "Version of the Flash plugin used to run the SWF player.", OFFSET(flashver), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_live", "Specify that the media is a live stream.", OFFSET(live), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtmp_live"}, + {"any", "both", 0, AV_OPT_TYPE_CONST, {.i64 = -2}, 0, 0, DEC, "rtmp_live"}, + {"live", "live stream", 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, DEC, "rtmp_live"}, + {"recorded", "recorded stream", 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 0, DEC, "rtmp_live"}, + {"rtmp_pageurl", "URL of the web page in which the media was embedded. By default no value will be sent.", OFFSET(pageurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, + {"rtmp_playpath", "Stream identifier to play or to publish", OFFSET(playpath), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_subscribe", "Name of live stream to subscribe to. Defaults to rtmp_playpath.", OFFSET(subscribe), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, + {"rtmp_swfurl", "URL of the SWF player. By default no value will be sent", OFFSET(swfurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, + {"rtmp_swfverify", "URL to player swf file, compute hash/size automatically. (unimplemented)", OFFSET(swfverify), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC}, + {"rtmp_tcurl", "URL of the target stream. Defaults to proto://host[:port]/app.", OFFSET(tcurl), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, DEC|ENC}, { NULL }, };

1 0

Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Apr 30 21:29:04 2014 +0200| [554a1ecab7efbdaf10ab459d73152bfb6e355dfa] | committer: Michael Niedermayer Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c' * commit '7266e24f176389d2e81bfc7c829934f7c8ae361c': hls: Sync the file number with the start sequence Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=554a1ecab7efbdaf1… ---

1 0

hls: Sync the file number with the start sequence
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Apr 29 18:20:17 2014 +0200| [7266e24f176389d2e81bfc7c829934f7c8ae361c] | committer: Luca Barbato hls: Sync the file number with the start sequence > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7266e24f176389d2e… --- libavformat/hlsenc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 79820f0..d36d3fb 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -173,7 +173,7 @@ static int hls_start(AVFormatContext *s) int err = 0; if (av_get_frame_filename(oc->filename, sizeof(oc->filename), - c->basename, c->wrap ? c->number % c->wrap : c->number) < 0) + c->basename, c->wrap ? c->sequence % c->wrap : c->sequence) < 0) return AVERROR(EINVAL); c->number++; @@ -195,9 +195,6 @@ static int hls_write_header(AVFormatContext *s) const char *pattern = "%d.ts"; int basename_size = strlen(s->filename) + strlen(pattern) + 1; - hls->number = 0; - - hls->sequence = hls->start_sequence; hls->recording_time = hls->time * AV_TIME_BASE; hls->start_pts = AV_NOPTS_VALUE;

1 0

Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Apr 30 21:14:56 2014 +0200| [5b4c8aac97863b4830717db6cb2cd4e3093f9a88] | committer: Michael Niedermayer Merge commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5' * commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5': hls: Factor the sequence computation Conflicts: libavformat/hlsenc.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b4c8aac97863b483… ---

1 0

hls: Factor the sequence computation
by git＠videolan.org 30 Apr '14

30 Apr '14

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Apr 29 18:37:01 2014 +0200| [a16431034d9bd44182bf844d6bbde2c98bc4e6b5] | committer: Luca Barbato hls: Factor the sequence computation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a16431034d9bd4418… --- libavformat/hlsenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index dc51e7e..79820f0 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -132,6 +132,7 @@ static int hls_window(AVFormatContext *s, int last) ListEntry *en; int target_duration = 0; int ret = 0; + int64_t sequence = FFMAX(hls->start_sequence, hls->sequence - hls->size); if ((ret = avio_open2(&hls->pb, s->filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL)) < 0) @@ -145,11 +146,10 @@ static int hls_window(AVFormatContext *s, int last) avio_printf(hls->pb, "#EXTM3U\n"); avio_printf(hls->pb, "#EXT-X-VERSION:3\n"); avio_printf(hls->pb, "#EXT-X-TARGETDURATION:%d\n", target_duration); - avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", - FFMAX(hls->start_sequence, hls->sequence - hls->size)); + avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", sequence); av_log(s, AV_LOG_VERBOSE, "EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", - FFMAX(hls->start_sequence, hls->sequence - hls->size)); + sequence); for (en = hls->list; en; en = en->next) { avio_printf(hls->pb, "#EXTINF:%d,\n", en->duration);

1 0