X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdirac.c;h=e11fea761e478a75ed52044d7f31f34badb4de5a;hb=6fee1b90ce3bf4fbdfde7016e0890057c9000487;hp=3eddc6708f0a8d2b10b3e6dee2262d3225767c3b;hpb=6ce9b4310cf1eba1a356191f30460a97e6653b91;p=ffmpeg diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c index 3eddc6708f0..e11fea761e4 100644 --- a/libavcodec/dirac.c +++ b/libavcodec/dirac.c @@ -2,20 +2,20 @@ * Copyright (C) 2007 Marco Gerards * Copyright (C) 2009 David Conrad * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,7 +25,7 @@ * @author Marco Gerards */ -#include "libavcore/imgutils.h" +#include "libavutil/imgutils.h" #include "dirac.h" #include "avcodec.h" #include "golomb.h" @@ -58,6 +58,7 @@ static const dirac_source_params dirac_source_parameters_defaults[] = { { 7680, 4320, 1, 0, 1, 6, 1, 3840, 2160, 0, 0, 3, 3 }, }; +/* [DIRAC_STD] Table 10.4 - Available preset pixel aspect ratio values */ static const AVRational dirac_preset_aspect_ratios[] = { {1, 1}, {10, 11}, @@ -67,11 +68,16 @@ static const AVRational dirac_preset_aspect_ratios[] = { {4, 3}, }; +/* [DIRAC_STD] Values 9,10 of 10.3.5 Frame Rate. + * Table 10.3 Available preset frame rate values + */ static const AVRational dirac_frame_rate[] = { {15000, 1001}, {25, 2}, }; +/* [DIRAC_STD] This should be equivalent to Table 10.5 Available signal + * range presets */ static const struct { uint8_t bitdepth; enum AVColorRange color_range; @@ -100,98 +106,126 @@ static const struct { { AVCOL_PRI_BT709, AVCOL_SPC_BT709, AVCOL_TRC_UNSPECIFIED /* DCinema */ }, }; -static const enum PixelFormat dirac_pix_fmt[2][3] = { - { PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P }, - { PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P }, +/* [DIRAC_STD] Table 10.2 Supported chroma sampling formats + luma Offset */ +static const enum AVPixelFormat dirac_pix_fmt[2][3] = { + { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P }, + { AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ420P }, }; +/* [DIRAC_STD] 10.3 Parse Source Parameters. + * source_parameters(base_video_format) */ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, dirac_source_params *source) { - AVRational frame_rate = (AVRational){0,0}; + AVRational frame_rate = {0,0}; unsigned luma_depth = 8, luma_offset = 16; int idx; + /* [DIRAC_STD] 10.3.2 Frame size. frame_size(video_params) */ + /* [DIRAC_STD] custom_dimensions_flag */ if (get_bits1(gb)) { - source->width = svq3_get_ue_golomb(gb); - source->height = svq3_get_ue_golomb(gb); + source->width = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_WIDTH */ + source->height = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_HEIGHT */ } - // chroma subsampling + /* [DIRAC_STD] 10.3.3 Chroma Sampling Format. + * chroma_sampling_format(video_params) */ + /* [DIRAC_STD] custom_chroma_format_flag */ if (get_bits1(gb)) + /* [DIRAC_STD] CHROMA_FORMAT_INDEX */ source->chroma_format = svq3_get_ue_golomb(gb); if (source->chroma_format > 2) { av_log(avctx, AV_LOG_ERROR, "Unknown chroma format %d\n", source->chroma_format); - return -1; + return AVERROR_INVALIDDATA; } + /* [DIRAC_STD] 10.3.4 Scan Format. scan_format(video_params) */ + /* [DIRAC_STD] custom_scan_format_flag */ if (get_bits1(gb)) + /* [DIRAC_STD] SOURCE_SAMPLING */ source->interlaced = svq3_get_ue_golomb(gb); if (source->interlaced > 1) - return -1; + return AVERROR_INVALIDDATA; - // frame rate - if (get_bits1(gb)) { + /* [DIRAC_STD] 10.3.5 Frame Rate. frame_rate(video_params) */ + if (get_bits1(gb)) { /* [DIRAC_STD] custom_frame_rate_flag */ source->frame_rate_index = svq3_get_ue_golomb(gb); if (source->frame_rate_index > 10) - return -1; + return AVERROR_INVALIDDATA; if (!source->frame_rate_index) { + /* [DIRAC_STD] FRAME_RATE_NUMER */ frame_rate.num = svq3_get_ue_golomb(gb); + /* [DIRAC_STD] FRAME_RATE_DENOM */ frame_rate.den = svq3_get_ue_golomb(gb); } } + /* [DIRAC_STD] preset_frame_rate(video_params, index) */ if (source->frame_rate_index > 0) { if (source->frame_rate_index <= 8) - frame_rate = ff_frame_rate_tab[source->frame_rate_index]; + frame_rate = ff_mpeg12_frame_rate_tab[source->frame_rate_index]; else + /* [DIRAC_STD] Table 10.3 values 9-10 */ frame_rate = dirac_frame_rate[source->frame_rate_index-9]; } av_reduce(&avctx->time_base.num, &avctx->time_base.den, frame_rate.den, frame_rate.num, 1<<30); - // aspect ratio - if (get_bits1(gb)) { + /* [DIRAC_STD] 10.3.6 Pixel Aspect Ratio. + * pixel_aspect_ratio(video_params) */ + if (get_bits1(gb)) { /* [DIRAC_STD] custom_pixel_aspect_ratio_flag */ + /* [DIRAC_STD] index */ source->aspect_ratio_index = svq3_get_ue_golomb(gb); if (source->aspect_ratio_index > 6) - return -1; + return AVERROR_INVALIDDATA; if (!source->aspect_ratio_index) { avctx->sample_aspect_ratio.num = svq3_get_ue_golomb(gb); avctx->sample_aspect_ratio.den = svq3_get_ue_golomb(gb); } } + /* [DIRAC_STD] Take value from Table 10.4 Available preset pixel + * aspect ratio values */ if (source->aspect_ratio_index > 0) avctx->sample_aspect_ratio = dirac_preset_aspect_ratios[source->aspect_ratio_index-1]; - if (get_bits1(gb)) { + /* [DIRAC_STD] 10.3.7 Clean area. clean_area(video_params) */ + if (get_bits1(gb)) { /* [DIRAC_STD] custom_clean_area_flag */ + /* [DIRAC_STD] CLEAN_WIDTH */ source->clean_width = svq3_get_ue_golomb(gb); + /* [DIRAC_STD] CLEAN_HEIGHT */ source->clean_height = svq3_get_ue_golomb(gb); + /* [DIRAC_STD] CLEAN_LEFT_OFFSET */ source->clean_left_offset = svq3_get_ue_golomb(gb); + /* [DIRAC_STD] CLEAN_RIGHT_OFFSET */ source->clean_right_offset = svq3_get_ue_golomb(gb); } - // Override signal range. - if (get_bits1(gb)) { + /* [DIRAC_STD] 10.3.8 Signal range. signal_range(video_params) + * WARNING: Some adaptation seems to be done using the + * AVCOL_RANGE_MPEG/JPEG values */ + if (get_bits1(gb)) { /* [DIRAC_STD] custom_signal_range_flag */ + /* [DIRAC_STD] index */ source->pixel_range_index = svq3_get_ue_golomb(gb); if (source->pixel_range_index > 4) - return -1; + return AVERROR_INVALIDDATA; // This assumes either fullrange or MPEG levels only if (!source->pixel_range_index) { luma_offset = svq3_get_ue_golomb(gb); luma_depth = av_log2(svq3_get_ue_golomb(gb))+1; - svq3_get_ue_golomb(gb); // chroma offset - svq3_get_ue_golomb(gb); // chroma excursion - + svq3_get_ue_golomb(gb); /* chroma offset */ + svq3_get_ue_golomb(gb); /* chroma excursion */ avctx->color_range = luma_offset ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; } } + /* [DIRAC_STD] Table 10.5 + * Available signal range presets <--> pixel_range_presets */ if (source->pixel_range_index > 0) { idx = source->pixel_range_index-1; luma_depth = pixel_range_presets[idx].bitdepth; @@ -203,24 +237,26 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, avctx->pix_fmt = dirac_pix_fmt[!luma_offset][source->chroma_format]; - // color spec - if (get_bits1(gb)) { + /* [DIRAC_STD] 10.3.9 Colour specification. colour_spec(video_params) */ + if (get_bits1(gb)) { /* [DIRAC_STD] custom_colour_spec_flag */ + /* [DIRAC_STD] index */ idx = source->color_spec_index = svq3_get_ue_golomb(gb); if (source->color_spec_index > 4) - return -1; + return AVERROR_INVALIDDATA; avctx->color_primaries = dirac_color_presets[idx].color_primaries; avctx->colorspace = dirac_color_presets[idx].colorspace; avctx->color_trc = dirac_color_presets[idx].color_trc; if (!source->color_spec_index) { + /* [DIRAC_STD] 10.3.9.1 Colour primaries */ if (get_bits1(gb)) { idx = svq3_get_ue_golomb(gb); if (idx < 3) avctx->color_primaries = dirac_primaries[idx]; } - + /* [DIRAC_STD] 10.3.9.2 Colour matrix */ if (get_bits1(gb)) { idx = svq3_get_ue_golomb(gb); if (!idx) @@ -228,7 +264,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, else if (idx == 1) avctx->colorspace = AVCOL_SPC_BT470BG; } - + /* [DIRAC_STD] 10.3.9.3 Transfer function */ if (get_bits1(gb) && !svq3_get_ue_golomb(gb)) avctx->color_trc = AVCOL_TRC_BT709; } @@ -242,16 +278,21 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb, return 0; } -int ff_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb, +/* [DIRAC_STD] 10. Sequence Header. sequence_header() */ +int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb, dirac_source_params *source) { - unsigned version_major, version_minor; + unsigned version_major; unsigned video_format, picture_coding_mode; + int ret; + /* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */ version_major = svq3_get_ue_golomb(gb); - version_minor = svq3_get_ue_golomb(gb); + svq3_get_ue_golomb(gb); /* version_minor */ avctx->profile = svq3_get_ue_golomb(gb); avctx->level = svq3_get_ue_golomb(gb); + /* [DIRAC_SPEC] sequence_header() -> base_video_format as defined in + * 10.2 Base Video Format, table 10.1 Dirac predefined video formats */ video_format = svq3_get_ue_golomb(gb); if (version_major < 2) @@ -260,26 +301,28 @@ int ff_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb, av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n"); if (video_format > 20) - return -1; + return AVERROR_INVALIDDATA; // Fill in defaults for the source parameters. *source = dirac_source_parameters_defaults[video_format]; - // Override the defaults. - if (parse_source_parameters(avctx, gb, source)) - return -1; + /* [DIRAC_STD] 10.3 Source Parameters + * Override the defaults. */ + if (ret = parse_source_parameters(avctx, gb, source)) + return ret; - if (av_check_image_size(source->width, source->height, 0, avctx)) - return -1; + if (ret = av_image_check_size(source->width, source->height, 0, avctx)) + return ret; avcodec_set_dimensions(avctx, source->width, source->height); - // currently only used to signal field coding + /* [DIRAC_STD] picture_coding_mode shall be 0 for fields and 1 for frames + * currently only used to signal field coding */ picture_coding_mode = svq3_get_ue_golomb(gb); if (picture_coding_mode != 0) { av_log(avctx, AV_LOG_ERROR, "Unsupported picture coding mode %d", picture_coding_mode); - return -1; + return AVERROR_INVALIDDATA; } return 0; }