Skip to content

F
ffmpeg.wasm-core
Commit efcc8fdd authored by Hendrik Leppkes's avatar Hendrik Leppkes
Browse files
Options

Merge commit 'e02de9df' 

* commit 'e02de9df':
  lavc: export Dirac parsing API used by the ogg demuxer as public
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 079b5d4e e02de9df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 120 deletions
configure
View file @ efcc8fdd
......@@ -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"
......
doc/APIchanges
View file @ efcc8fdd
......@@ -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()
......
libavcodec/Makefile
View file @ efcc8fdd
......@@ -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 \
......
libavcodec/dirac.c
View file @ efcc8fdd
This diff is collapsed.
libavcodec/dirac.h
View file @ efcc8fdd
......@@ -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 */
libavcodec/diracdec.c
View file @ efcc8fdd
......@@ -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;
......
libavformat/oggparsedirac.c
View file @ efcc8fdd
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment