mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master: libopenjpeg: introduce lowres and lowqual private options FATE: add a test for flac cover art. cafdec: allow larger ALAC magic cookie alac: fix channel pointer assignment for 24 and 32-bit Conflicts: libavcodec/alac.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3c033d00f5
|
@ -328,16 +328,16 @@ static int decode_element(AVCodecContext *avctx, void *data, int ch_index,
|
||||||
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
if (alac->direct_output) {
|
|
||||||
for (ch = 0; ch < channels; ch++)
|
|
||||||
alac->output_samples_buffer[ch] = (int32_t *)alac->frame.extended_data[ch_index + ch];
|
|
||||||
}
|
|
||||||
} else if (output_samples != alac->nb_samples) {
|
} else if (output_samples != alac->nb_samples) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %u != %d\n",
|
av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %u != %d\n",
|
||||||
output_samples, alac->nb_samples);
|
output_samples, alac->nb_samples);
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
alac->nb_samples = output_samples;
|
alac->nb_samples = output_samples;
|
||||||
|
if (alac->direct_output) {
|
||||||
|
for (ch = 0; ch < channels; ch++)
|
||||||
|
alac->output_samples_buffer[ch] = (int32_t *)alac->frame.extended_data[ch_index + ch];
|
||||||
|
}
|
||||||
|
|
||||||
if (is_compressed) {
|
if (is_compressed) {
|
||||||
int16_t lpc_coefs[2][32];
|
int16_t lpc_coefs[2][32];
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
* JPEG 2000 decoder using libopenjpeg
|
* JPEG 2000 decoder using libopenjpeg
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "libavutil/opt.h"
|
||||||
#include "libavutil/imgutils.h"
|
#include "libavutil/imgutils.h"
|
||||||
#include "libavutil/pixfmt.h"
|
#include "libavutil/pixfmt.h"
|
||||||
#include "avcodec.h"
|
#include "avcodec.h"
|
||||||
|
@ -54,8 +55,10 @@ static const enum PixelFormat libopenjpeg_yuv_pix_fmts[] = {YUV_PIXEL_FORMATS};
|
||||||
static const enum PixelFormat libopenjpeg_all_pix_fmts[] = {RGB_PIXEL_FORMATS,GRAY_PIXEL_FORMATS,YUV_PIXEL_FORMATS};
|
static const enum PixelFormat libopenjpeg_all_pix_fmts[] = {RGB_PIXEL_FORMATS,GRAY_PIXEL_FORMATS,YUV_PIXEL_FORMATS};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
AVClass *class;
|
||||||
opj_dparameters_t dec_params;
|
opj_dparameters_t dec_params;
|
||||||
AVFrame image;
|
AVFrame image;
|
||||||
|
int lowqual;
|
||||||
} LibOpenJPEGContext;
|
} LibOpenJPEGContext;
|
||||||
|
|
||||||
static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum PixelFormat pix_fmt){
|
static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum PixelFormat pix_fmt){
|
||||||
|
@ -254,8 +257,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
|
opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
|
||||||
|
|
||||||
ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
|
ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
|
||||||
|
ctx->dec_params.cp_reduce = avctx->lowres;
|
||||||
|
ctx->dec_params.cp_layer = ctx->lowqual;
|
||||||
// Tie decoder with decoding parameters
|
// Tie decoder with decoding parameters
|
||||||
opj_setup_decoder(dec, &ctx->dec_params);
|
opj_setup_decoder(dec, &ctx->dec_params);
|
||||||
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
|
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
|
||||||
|
@ -275,6 +279,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
|
||||||
}
|
}
|
||||||
width = image->x1 - image->x0;
|
width = image->x1 - image->x0;
|
||||||
height = image->y1 - image->y0;
|
height = image->y1 - image->y0;
|
||||||
|
|
||||||
if(av_image_check_size(width, height, 0, avctx) < 0) {
|
if(av_image_check_size(width, height, 0, avctx) < 0) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
|
av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
|
||||||
goto done;
|
goto done;
|
||||||
|
@ -380,6 +385,20 @@ static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx)
|
||||||
return 0 ;
|
return 0 ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define OFFSET(x) offsetof(LibOpenJPEGContext, x)
|
||||||
|
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
|
||||||
|
|
||||||
|
static const AVOption options[] = {
|
||||||
|
{ "lowqual", "Limit the number of layers used for decoding", OFFSET(lowqual), AV_OPT_TYPE_INT, { 0 }, 0, INT_MAX, VD },
|
||||||
|
{ NULL },
|
||||||
|
};
|
||||||
|
|
||||||
|
static const AVClass class = {
|
||||||
|
.class_name = "libopenjpeg",
|
||||||
|
.item_name = av_default_item_name,
|
||||||
|
.option = options,
|
||||||
|
.version = LIBAVUTIL_VERSION_INT,
|
||||||
|
};
|
||||||
|
|
||||||
AVCodec ff_libopenjpeg_decoder = {
|
AVCodec ff_libopenjpeg_decoder = {
|
||||||
.name = "libopenjpeg",
|
.name = "libopenjpeg",
|
||||||
|
@ -392,5 +411,6 @@ AVCodec ff_libopenjpeg_decoder = {
|
||||||
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
|
.capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
|
||||||
.max_lowres = 5,
|
.max_lowres = 5,
|
||||||
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
|
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),
|
||||||
|
.priv_class = &class,
|
||||||
.init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy),
|
.init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy),
|
||||||
};
|
};
|
||||||
|
|
|
@ -124,7 +124,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
|
||||||
#define ALAC_HEADER 36
|
#define ALAC_HEADER 36
|
||||||
#define ALAC_NEW_KUKI 24
|
#define ALAC_NEW_KUKI 24
|
||||||
uint8_t preamble[12];
|
uint8_t preamble[12];
|
||||||
if (size < ALAC_NEW_KUKI || size > ALAC_PREAMBLE + ALAC_HEADER) {
|
if (size < ALAC_NEW_KUKI) {
|
||||||
av_log(s, AV_LOG_ERROR, "invalid ALAC magic cookie\n");
|
av_log(s, AV_LOG_ERROR, "invalid ALAC magic cookie\n");
|
||||||
avio_skip(pb, size);
|
avio_skip(pb, size);
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
|
@ -2,6 +2,10 @@ FATE_COVER_ART += fate-cover-art-ape
|
||||||
fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
|
fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
|
||||||
fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
|
fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
|
||||||
|
|
||||||
|
FATE_COVER_ART += fate-cover-art-flac
|
||||||
|
fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
|
||||||
|
fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261
|
||||||
|
|
||||||
FATE_COVER_ART += fate-cover-art-m4a
|
FATE_COVER_ART += fate-cover-art-m4a
|
||||||
fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
|
fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
|
||||||
fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
|
fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
|
||||||
|
|
Loading…
Reference in New Issue