mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
Merge commit 'e02de9df4b218bd6e1e927b67fd4075741545688'
* commit 'e02de9df4b218bd6e1e927b67fd4075741545688': lavc: export Dirac parsing API used by the ogg demuxer as public Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
commit
efcc8fddd6
6
configure
vendored
6
configure
vendored
@ -1982,6 +1982,7 @@ CONFIG_EXTRA="
|
||||
blockdsp
|
||||
bswapdsp
|
||||
cabac
|
||||
dirac_parse
|
||||
dvprofile
|
||||
exif
|
||||
faandct
|
||||
@ -2216,6 +2217,7 @@ threads_if_any="$THREADS_LIST"
|
||||
|
||||
# subsystems
|
||||
dct_select="rdft"
|
||||
dirac_parse_select="golomb"
|
||||
error_resilience_select="me_cmp"
|
||||
faandct_deps="faan fdctdsp"
|
||||
faanidct_deps="faan idctdsp"
|
||||
@ -2272,7 +2274,7 @@ cscd_decoder_select="lzo"
|
||||
cscd_decoder_suggest="zlib"
|
||||
dca_decoder_select="fmtconvert mdct"
|
||||
dds_decoder_select="texturedsp"
|
||||
dirac_decoder_select="dwt golomb videodsp mpegvideoenc"
|
||||
dirac_decoder_select="dirac_parse dwt golomb videodsp mpegvideoenc"
|
||||
dnxhd_decoder_select="blockdsp idctdsp"
|
||||
dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp"
|
||||
dvvideo_decoder_select="dvprofile idctdsp"
|
||||
@ -2706,7 +2708,7 @@ mxf_opatom_muxer_select="mxf_muxer"
|
||||
nut_muxer_select="riffenc"
|
||||
nuv_demuxer_select="riffdec"
|
||||
oga_muxer_select="ogg_muxer"
|
||||
ogg_demuxer_select="golomb"
|
||||
ogg_demuxer_select="dirac_parse"
|
||||
opus_muxer_select="ogg_muxer"
|
||||
psp_muxer_select="mov_muxer"
|
||||
rtp_demuxer_select="sdp_demuxer"
|
||||
|
||||
@ -14,10 +14,12 @@ libavutil: 2015-08-28
|
||||
|
||||
|
||||
API changes, most recent first:
|
||||
2015-12-17 - lavc 57.18.100 / 57.11.0 - avcodec.h
|
||||
2015-12-17 - lavc 57.18.100 / 57.11.0 - avcodec.h dirac.h
|
||||
xxxxxxx - Add av_packet_add_side_data().
|
||||
xxxxxxx - Add AVCodecContext.coded_side_data.
|
||||
xxxxxxx - Add AVCPBProperties API.
|
||||
xxxxxxx - Add a new public header dirac.h containing
|
||||
av_dirac_parse_sequence_header()
|
||||
|
||||
2015-12-11 - xxxxxxx - lavf 57.20.100 - avformat.h
|
||||
Add av_program_add_stream_index()
|
||||
|
||||
@ -7,6 +7,7 @@ HEADERS = avcodec.h \
|
||||
avfft.h \
|
||||
dv_profile.h \
|
||||
d3d11va.h \
|
||||
dirac.h \
|
||||
dxva2.h \
|
||||
qsv.h \
|
||||
vaapi.h \
|
||||
@ -26,6 +27,7 @@ OBJS = allcodecs.o \
|
||||
bitstream_filter.o \
|
||||
codec_desc.o \
|
||||
d3d11va.o \
|
||||
dirac.o \
|
||||
dv_profile.o \
|
||||
imgconvert.o \
|
||||
mathtables.o \
|
||||
|
||||
@ -34,6 +34,28 @@
|
||||
#include "internal.h"
|
||||
#include "mpeg12data.h"
|
||||
|
||||
#if CONFIG_DIRAC_PARSE
|
||||
|
||||
typedef struct dirac_source_params {
|
||||
unsigned width;
|
||||
unsigned height;
|
||||
uint8_t chroma_format; ///< 0: 444 1: 422 2: 420
|
||||
|
||||
uint8_t interlaced;
|
||||
uint8_t top_field_first;
|
||||
|
||||
uint8_t frame_rate_index; ///< index into dirac_frame_rate[]
|
||||
uint8_t aspect_ratio_index; ///< index into dirac_aspect_ratio[]
|
||||
|
||||
uint16_t clean_width;
|
||||
uint16_t clean_height;
|
||||
uint16_t clean_left_offset;
|
||||
uint16_t clean_right_offset;
|
||||
|
||||
uint8_t pixel_range_index; ///< index into dirac_pixel_range_presets[]
|
||||
uint8_t color_spec_index; ///< index into dirac_color_spec_presets[]
|
||||
} dirac_source_params;
|
||||
|
||||
/* defaults for source parameters */
|
||||
static const dirac_source_params dirac_source_parameters_defaults[] = {
|
||||
{ 640, 480, 2, 0, 0, 1, 1, 640, 480, 0, 0, 1, 0 },
|
||||
@ -118,8 +140,8 @@ static const enum AVPixelFormat dirac_pix_fmt[][3] = {
|
||||
|
||||
/* [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, int *bit_depth)
|
||||
static int parse_source_parameters(AVDiracSeqHeader *dsh, GetBitContext *gb,
|
||||
void *log_ctx)
|
||||
{
|
||||
AVRational frame_rate = { 0, 0 };
|
||||
unsigned luma_depth = 8, luma_offset = 16;
|
||||
@ -129,8 +151,8 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
|
||||
/* [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); /* [DIRAC_STD] FRAME_WIDTH */
|
||||
source->height = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_HEIGHT */
|
||||
dsh->width = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_WIDTH */
|
||||
dsh->height = svq3_get_ue_golomb(gb); /* [DIRAC_STD] FRAME_HEIGHT */
|
||||
}
|
||||
|
||||
/* [DIRAC_STD] 10.3.3 Chroma Sampling Format.
|
||||
@ -138,10 +160,11 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
|
||||
/* [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 > 2U) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unknown chroma format %d\n",
|
||||
source->chroma_format);
|
||||
dsh->chroma_format = svq3_get_ue_golomb(gb);
|
||||
if (dsh->chroma_format > 2U) {
|
||||
if (log_ctx)
|
||||
av_log(log_ctx, AV_LOG_ERROR, "Unknown chroma format %d\n",
|
||||
dsh->chroma_format);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
@ -149,18 +172,18 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
|
||||
/* [DIRAC_STD] custom_scan_format_flag */
|
||||
if (get_bits1(gb))
|
||||
/* [DIRAC_STD] SOURCE_SAMPLING */
|
||||
source->interlaced = svq3_get_ue_golomb(gb);
|
||||
if (source->interlaced > 1U)
|
||||
dsh->interlaced = svq3_get_ue_golomb(gb);
|
||||
if (dsh->interlaced > 1U)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* [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);
|
||||
dsh->frame_rate_index = svq3_get_ue_golomb(gb);
|
||||
|
||||
if (source->frame_rate_index > 10U)
|
||||
if (dsh->frame_rate_index > 10U)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
if (!source->frame_rate_index) {
|
||||
if (!dsh->frame_rate_index) {
|
||||
/* [DIRAC_STD] FRAME_RATE_NUMER */
|
||||
frame_rate.num = svq3_get_ue_golomb(gb);
|
||||
/* [DIRAC_STD] FRAME_RATE_DENOM */
|
||||
@ -168,45 +191,45 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
|
||||
}
|
||||
}
|
||||
/* [DIRAC_STD] preset_frame_rate(video_params, index) */
|
||||
if (source->frame_rate_index > 0) {
|
||||
if (source->frame_rate_index <= 8)
|
||||
frame_rate = ff_mpeg12_frame_rate_tab[source->frame_rate_index];
|
||||
if (dsh->frame_rate_index > 0) {
|
||||
if (dsh->frame_rate_index <= 8)
|
||||
frame_rate = ff_mpeg12_frame_rate_tab[dsh->frame_rate_index];
|
||||
else
|
||||
/* [DIRAC_STD] Table 10.3 values 9-10 */
|
||||
frame_rate = dirac_frame_rate[source->frame_rate_index - 9];
|
||||
frame_rate = dirac_frame_rate[dsh->frame_rate_index - 9];
|
||||
}
|
||||
avctx->framerate = frame_rate;
|
||||
dsh->framerate = frame_rate;
|
||||
|
||||
/* [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);
|
||||
dsh->aspect_ratio_index = svq3_get_ue_golomb(gb);
|
||||
|
||||
if (source->aspect_ratio_index > 6U)
|
||||
if (dsh->aspect_ratio_index > 6U)
|
||||
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);
|
||||
if (!dsh->aspect_ratio_index) {
|
||||
dsh->sample_aspect_ratio.num = svq3_get_ue_golomb(gb);
|
||||
dsh->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 (dsh->aspect_ratio_index > 0)
|
||||
dsh->sample_aspect_ratio =
|
||||
dirac_preset_aspect_ratios[dsh->aspect_ratio_index - 1];
|
||||
|
||||
/* [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);
|
||||
dsh->clean_width = svq3_get_ue_golomb(gb);
|
||||
/* [DIRAC_STD] CLEAN_HEIGHT */
|
||||
source->clean_height = svq3_get_ue_golomb(gb);
|
||||
dsh->clean_height = svq3_get_ue_golomb(gb);
|
||||
/* [DIRAC_STD] CLEAN_LEFT_OFFSET */
|
||||
source->clean_left_offset = svq3_get_ue_golomb(gb);
|
||||
dsh->clean_left_offset = svq3_get_ue_golomb(gb);
|
||||
/* [DIRAC_STD] CLEAN_RIGHT_OFFSET */
|
||||
source->clean_right_offset = svq3_get_ue_golomb(gb);
|
||||
dsh->clean_right_offset = svq3_get_ue_golomb(gb);
|
||||
}
|
||||
|
||||
/* [DIRAC_STD] 10.3.8 Signal range. signal_range(video_params)
|
||||
@ -214,127 +237,160 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
|
||||
* 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);
|
||||
dsh->pixel_range_index = svq3_get_ue_golomb(gb);
|
||||
|
||||
if (source->pixel_range_index > 4U)
|
||||
if (dsh->pixel_range_index > 4U)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* This assumes either fullrange or MPEG levels only */
|
||||
if (!source->pixel_range_index) {
|
||||
if (!dsh->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 */
|
||||
avctx->color_range = luma_offset ? AVCOL_RANGE_MPEG
|
||||
: AVCOL_RANGE_JPEG;
|
||||
dsh->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;
|
||||
if (dsh->pixel_range_index > 0) {
|
||||
idx = dsh->pixel_range_index - 1;
|
||||
luma_depth = pixel_range_presets[idx].bitdepth;
|
||||
avctx->color_range = pixel_range_presets[idx].color_range;
|
||||
dsh->color_range = pixel_range_presets[idx].color_range;
|
||||
}
|
||||
|
||||
*bit_depth = luma_depth;
|
||||
dsh->bit_depth = luma_depth;
|
||||
|
||||
avctx->pix_fmt = dirac_pix_fmt[source->chroma_format][source->pixel_range_index-2];
|
||||
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_x_shift, &chroma_y_shift);
|
||||
if ((source->width % (1<<chroma_x_shift)) || (source->height % (1<<chroma_y_shift))) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Dimensions must be an integer multiple of the chroma subsampling\n");
|
||||
dsh->pix_fmt = dirac_pix_fmt[dsh->chroma_format][dsh->pixel_range_index-2];
|
||||
avcodec_get_chroma_sub_sample(dsh->pix_fmt, &chroma_x_shift, &chroma_y_shift);
|
||||
if ((dsh->width % (1<<chroma_x_shift)) || (dsh->height % (1<<chroma_y_shift))) {
|
||||
if (log_ctx)
|
||||
av_log(log_ctx, AV_LOG_ERROR, "Dimensions must be an integer multiple of the chroma subsampling\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
|
||||
/* [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);
|
||||
idx = dsh->color_spec_index = svq3_get_ue_golomb(gb);
|
||||
|
||||
if (source->color_spec_index > 4U)
|
||||
if (dsh->color_spec_index > 4U)
|
||||
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;
|
||||
dsh->color_primaries = dirac_color_presets[idx].color_primaries;
|
||||
dsh->colorspace = dirac_color_presets[idx].colorspace;
|
||||
dsh->color_trc = dirac_color_presets[idx].color_trc;
|
||||
|
||||
if (!source->color_spec_index) {
|
||||
if (!dsh->color_spec_index) {
|
||||
/* [DIRAC_STD] 10.3.9.1 Colour primaries */
|
||||
if (get_bits1(gb)) {
|
||||
idx = svq3_get_ue_golomb(gb);
|
||||
if (idx < 3U)
|
||||
avctx->color_primaries = dirac_primaries[idx];
|
||||
dsh->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)
|
||||
avctx->colorspace = AVCOL_SPC_BT709;
|
||||
dsh->colorspace = AVCOL_SPC_BT709;
|
||||
else if (idx == 1)
|
||||
avctx->colorspace = AVCOL_SPC_BT470BG;
|
||||
dsh->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;
|
||||
dsh->color_trc = AVCOL_TRC_BT709;
|
||||
}
|
||||
} else {
|
||||
idx = source->color_spec_index;
|
||||
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;
|
||||
idx = dsh->color_spec_index;
|
||||
dsh->color_primaries = dirac_color_presets[idx].color_primaries;
|
||||
dsh->colorspace = dirac_color_presets[idx].colorspace;
|
||||
dsh->color_trc = dirac_color_presets[idx].color_trc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* [DIRAC_STD] 10. Sequence Header. sequence_header() */
|
||||
int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
|
||||
dirac_source_params *source,
|
||||
DiracVersionInfo *version,
|
||||
int *bit_depth)
|
||||
int av_dirac_parse_sequence_header(AVDiracSeqHeader **pdsh,
|
||||
const uint8_t *buf, size_t buf_size,
|
||||
void *log_ctx)
|
||||
{
|
||||
AVDiracSeqHeader *dsh;
|
||||
GetBitContext gb;
|
||||
unsigned video_format, picture_coding_mode;
|
||||
int ret;
|
||||
|
||||
dsh = av_mallocz(sizeof(*dsh));
|
||||
if (!dsh)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
ret = init_get_bits8(&gb, buf, buf_size);
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
|
||||
/* [DIRAC_SPEC] 10.1 Parse Parameters. parse_parameters() */
|
||||
version->major = svq3_get_ue_golomb(gb);
|
||||
version->minor = svq3_get_ue_golomb(gb);
|
||||
avctx->profile = svq3_get_ue_golomb(gb);
|
||||
avctx->level = svq3_get_ue_golomb(gb);
|
||||
dsh->version.major = svq3_get_ue_golomb(&gb);
|
||||
dsh->version.minor = svq3_get_ue_golomb(&gb);
|
||||
dsh->profile = svq3_get_ue_golomb(&gb);
|
||||
dsh->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);
|
||||
video_format = svq3_get_ue_golomb(&gb);
|
||||
|
||||
if (version->major < 2)
|
||||
av_log(avctx, AV_LOG_WARNING, "Stream is old and may not work\n");
|
||||
else if (version->major > 2)
|
||||
av_log(avctx, AV_LOG_WARNING, "Stream may have unhandled features\n");
|
||||
if (dsh->version.major < 2 && log_ctx)
|
||||
av_log(log_ctx, AV_LOG_WARNING, "Stream is old and may not work\n");
|
||||
else if (dsh->version.major > 2 && log_ctx)
|
||||
av_log(log_ctx, AV_LOG_WARNING, "Stream may have unhandled features\n");
|
||||
|
||||
if (video_format > 20U)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* Fill in defaults for the source parameters. */
|
||||
*source = dirac_source_parameters_defaults[video_format];
|
||||
dsh->width = dirac_source_parameters_defaults[video_format].width;
|
||||
dsh->height = dirac_source_parameters_defaults[video_format].height;
|
||||
dsh->chroma_format = dirac_source_parameters_defaults[video_format].chroma_format;
|
||||
dsh->interlaced = dirac_source_parameters_defaults[video_format].interlaced;
|
||||
dsh->top_field_first = dirac_source_parameters_defaults[video_format].top_field_first;
|
||||
dsh->frame_rate_index = dirac_source_parameters_defaults[video_format].frame_rate_index;
|
||||
dsh->aspect_ratio_index = dirac_source_parameters_defaults[video_format].aspect_ratio_index;
|
||||
dsh->clean_width = dirac_source_parameters_defaults[video_format].clean_width;
|
||||
dsh->clean_height = dirac_source_parameters_defaults[video_format].clean_height;
|
||||
dsh->clean_left_offset = dirac_source_parameters_defaults[video_format].clean_left_offset;
|
||||
dsh->clean_right_offset = dirac_source_parameters_defaults[video_format].clean_right_offset;
|
||||
dsh->pixel_range_index = dirac_source_parameters_defaults[video_format].pixel_range_index;
|
||||
dsh->color_spec_index = dirac_source_parameters_defaults[video_format].color_spec_index;
|
||||
|
||||
/* [DIRAC_STD] 10.3 Source Parameters
|
||||
* Override the defaults. */
|
||||
if (ret = parse_source_parameters(avctx, gb, source, bit_depth))
|
||||
return ret;
|
||||
|
||||
ret = ff_set_dimensions(avctx, source->width, source->height);
|
||||
ret = parse_source_parameters(dsh, &gb, log_ctx);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ff_set_sar(avctx, avctx->sample_aspect_ratio);
|
||||
goto fail;
|
||||
|
||||
/* [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);
|
||||
picture_coding_mode = svq3_get_ue_golomb(&gb);
|
||||
if (picture_coding_mode != 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Unsupported picture coding mode %d\n",
|
||||
picture_coding_mode);
|
||||
return AVERROR_INVALIDDATA;
|
||||
if (log_ctx) {
|
||||
av_log(log_ctx, AV_LOG_ERROR, "Unsupported picture coding mode %d",
|
||||
picture_coding_mode);
|
||||
}
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
*pdsh = dsh;
|
||||
return 0;
|
||||
fail:
|
||||
av_freep(&dsh);
|
||||
*pdsh = NULL;
|
||||
return ret;
|
||||
}
|
||||
#else
|
||||
int av_dirac_parse_sequence_header(AVDiracSeqHeader **pdsh,
|
||||
const uint8_t *buf, size_t buf_size,
|
||||
void *log_ctx)
|
||||
{
|
||||
return AVERROR(ENOSYS);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -32,7 +32,6 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
|
||||
/**
|
||||
* Parse code values:
|
||||
@ -61,7 +60,7 @@ typedef struct DiracVersionInfo {
|
||||
int minor;
|
||||
} DiracVersionInfo;
|
||||
|
||||
typedef struct dirac_source_params {
|
||||
typedef struct AVDiracSeqHeader {
|
||||
unsigned width;
|
||||
unsigned height;
|
||||
uint8_t chroma_format; ///< 0: 444 1: 422 2: 420
|
||||
@ -79,11 +78,36 @@ typedef struct dirac_source_params {
|
||||
|
||||
uint8_t pixel_range_index; ///< index into dirac_pixel_range_presets[]
|
||||
uint8_t color_spec_index; ///< index into dirac_color_spec_presets[]
|
||||
} dirac_source_params;
|
||||
|
||||
int avpriv_dirac_parse_sequence_header(AVCodecContext *avctx, GetBitContext *gb,
|
||||
dirac_source_params *source,
|
||||
DiracVersionInfo *version,
|
||||
int *bit_depth);
|
||||
int profile;
|
||||
int level;
|
||||
|
||||
AVRational framerate;
|
||||
AVRational sample_aspect_ratio;
|
||||
|
||||
enum AVPixelFormat pix_fmt;
|
||||
enum AVColorRange color_range;
|
||||
enum AVColorPrimaries color_primaries;
|
||||
enum AVColorTransferCharacteristic color_trc;
|
||||
enum AVColorSpace colorspace;
|
||||
|
||||
DiracVersionInfo version;
|
||||
int bit_depth;
|
||||
} AVDiracSeqHeader;
|
||||
|
||||
/**
|
||||
* Parse a Dirac sequence header.
|
||||
*
|
||||
* @param dsh this function will allocate and fill an AVDiracSeqHeader struct
|
||||
* and write it into this pointer. The caller must free it with
|
||||
* av_free().
|
||||
* @param buf the data buffer
|
||||
* @param buf_size the size of the data buffer in bytes
|
||||
* @param log_ctx if non-NULL, this function will log errors here
|
||||
* @return 0 on success, a negative AVERROR code on failure
|
||||
*/
|
||||
int av_dirac_parse_sequence_header(AVDiracSeqHeader **dsh,
|
||||
const uint8_t *buf, size_t buf_size,
|
||||
void *log_ctx);
|
||||
|
||||
#endif /* AVCODEC_DIRAC_H */
|
||||
|
||||
@ -142,7 +142,7 @@ typedef struct DiracContext {
|
||||
DiracDSPContext diracdsp;
|
||||
DiracVersionInfo version;
|
||||
GetBitContext gb;
|
||||
dirac_source_params source;
|
||||
AVDiracSeqHeader seq;
|
||||
int seen_sequence_header;
|
||||
int frame_number; /* number of the next frame to display */
|
||||
Plane plane[3];
|
||||
@ -339,16 +339,16 @@ static int add_frame(DiracFrame *framelist[], int maxframes, DiracFrame *frame)
|
||||
|
||||
static int alloc_sequence_buffers(DiracContext *s)
|
||||
{
|
||||
int sbwidth = DIVRNDUP(s->source.width, 4);
|
||||
int sbheight = DIVRNDUP(s->source.height, 4);
|
||||
int sbwidth = DIVRNDUP(s->seq.width, 4);
|
||||
int sbheight = DIVRNDUP(s->seq.height, 4);
|
||||
int i, w, h, top_padding;
|
||||
|
||||
/* todo: think more about this / use or set Plane here */
|
||||
for (i = 0; i < 3; i++) {
|
||||
int max_xblen = MAX_BLOCKSIZE >> (i ? s->chroma_x_shift : 0);
|
||||
int max_yblen = MAX_BLOCKSIZE >> (i ? s->chroma_y_shift : 0);
|
||||
w = s->source.width >> (i ? s->chroma_x_shift : 0);
|
||||
h = s->source.height >> (i ? s->chroma_y_shift : 0);
|
||||
w = s->seq.width >> (i ? s->chroma_x_shift : 0);
|
||||
h = s->seq.height >> (i ? s->chroma_y_shift : 0);
|
||||
|
||||
/* we allocate the max we support here since num decompositions can
|
||||
* change from frame to frame. Stride is aligned to 16 for SIMD, and
|
||||
@ -377,8 +377,8 @@ static int alloc_sequence_buffers(DiracContext *s)
|
||||
|
||||
static int alloc_buffers(DiracContext *s, int stride)
|
||||
{
|
||||
int w = s->source.width;
|
||||
int h = s->source.height;
|
||||
int w = s->seq.width;
|
||||
int h = s->seq.height;
|
||||
|
||||
av_assert0(stride >= w);
|
||||
stride += 64;
|
||||
@ -937,8 +937,8 @@ static void init_planes(DiracContext *s)
|
||||
for (i = 0; i < 3; i++) {
|
||||
Plane *p = &s->plane[i];
|
||||
|
||||
p->width = s->source.width >> (i ? s->chroma_x_shift : 0);
|
||||
p->height = s->source.height >> (i ? s->chroma_y_shift : 0);
|
||||
p->width = s->seq.width >> (i ? s->chroma_x_shift : 0);
|
||||
p->height = s->seq.height >> (i ? s->chroma_y_shift : 0);
|
||||
p->idwt_width = w = CALC_PADDING(p->width , s->wavelet_depth);
|
||||
p->idwt_height = h = CALC_PADDING(p->height, s->wavelet_depth);
|
||||
p->idwt_stride = FFALIGN(p->idwt_width << (1 + s->pshift), 8);
|
||||
@ -1370,8 +1370,8 @@ static int dirac_unpack_block_motion_data(DiracContext *s)
|
||||
align_get_bits(gb);
|
||||
|
||||
/* [DIRAC_STD] 11.2.4 and 12.2.1 Number of blocks and superblocks */
|
||||
s->sbwidth = DIVRNDUP(s->source.width, 4*s->plane[0].xbsep);
|
||||
s->sbheight = DIVRNDUP(s->source.height, 4*s->plane[0].ybsep);
|
||||
s->sbwidth = DIVRNDUP(s->seq.width, 4*s->plane[0].xbsep);
|
||||
s->sbheight = DIVRNDUP(s->seq.height, 4*s->plane[0].ybsep);
|
||||
s->blwidth = 4 * s->sbwidth;
|
||||
s->blheight = 4 * s->sbheight;
|
||||
|
||||
@ -1966,6 +1966,7 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int
|
||||
{
|
||||
DiracContext *s = avctx->priv_data;
|
||||
DiracFrame *pic = NULL;
|
||||
AVDiracSeqHeader *dsh;
|
||||
int ret, i;
|
||||
uint8_t parse_code;
|
||||
unsigned tmp;
|
||||
@ -1982,10 +1983,24 @@ static int dirac_decode_data_unit(AVCodecContext *avctx, const uint8_t *buf, int
|
||||
return 0;
|
||||
|
||||
/* [DIRAC_STD] 10. Sequence header */
|
||||
ret = avpriv_dirac_parse_sequence_header(avctx, &s->gb, &s->source,
|
||||
&s->version, &s->bit_depth);
|
||||
if (ret < 0)
|
||||
ret = av_dirac_parse_sequence_header(&dsh, buf + DATA_UNIT_HEADER_SIZE, size - DATA_UNIT_HEADER_SIZE, avctx);
|
||||
if (ret < 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "error parsing sequence header");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ff_set_dimensions(avctx, dsh->width, dsh->height);
|
||||
avctx->pix_fmt = dsh->pix_fmt;
|
||||
avctx->color_range = dsh->color_range;
|
||||
avctx->color_trc = dsh->color_trc;
|
||||
avctx->color_primaries = dsh->color_primaries;
|
||||
avctx->colorspace = dsh->colorspace;
|
||||
avctx->profile = dsh->profile;
|
||||
avctx->level = dsh->level;
|
||||
avctx->framerate = dsh->framerate;
|
||||
s->bit_depth = dsh->bit_depth;
|
||||
s->seq = *dsh;
|
||||
av_freep(&dsh);
|
||||
|
||||
s->pshift = s->bit_depth > 8;
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include "libavcodec/get_bits.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavcodec/dirac.h"
|
||||
#include "avformat.h"
|
||||
#include "internal.h"
|
||||
@ -29,28 +29,33 @@ static int dirac_header(AVFormatContext *s, int idx)
|
||||
struct ogg *ogg = s->priv_data;
|
||||
struct ogg_stream *os = ogg->streams + idx;
|
||||
AVStream *st = s->streams[idx];
|
||||
dirac_source_params source;
|
||||
DiracVersionInfo version;
|
||||
GetBitContext gb;
|
||||
int ret, bit_depth;
|
||||
AVDiracSeqHeader *dsh;
|
||||
int ret;
|
||||
|
||||
// already parsed the header
|
||||
if (st->codec->codec_id == AV_CODEC_ID_DIRAC)
|
||||
return 0;
|
||||
|
||||
ret = init_get_bits8(&gb, os->buf + os->pstart + 13, (os->psize - 13));
|
||||
ret = av_dirac_parse_sequence_header(&dsh, os->buf + os->pstart + 13, (os->psize - 13), s);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = avpriv_dirac_parse_sequence_header(st->codec, &gb, &source, &version,
|
||||
&bit_depth);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||
st->codec->codec_id = AV_CODEC_ID_DIRAC;
|
||||
st->codec->width = dsh->width;
|
||||
st->codec->height = dsh->height;
|
||||
st->codec->pix_fmt = dsh->pix_fmt;
|
||||
st->codec->color_range = dsh->color_range;
|
||||
st->codec->color_trc = dsh->color_trc;
|
||||
st->codec->color_primaries = dsh->color_primaries;
|
||||
st->codec->colorspace = dsh->colorspace;
|
||||
st->codec->profile = dsh->profile;
|
||||
st->codec->level = dsh->level;
|
||||
|
||||
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||
st->codec->codec_id = AV_CODEC_ID_DIRAC;
|
||||
// dirac in ogg always stores timestamps as though the video were interlaced
|
||||
avpriv_set_pts_info(st, 64, st->codec->framerate.den, 2*st->codec->framerate.num);
|
||||
avpriv_set_pts_info(st, 64, dsh->framerate.den, 2 * dsh->framerate.num);
|
||||
|
||||
av_freep(&dsh);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user