mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-01-26 06:05:06 +00:00
Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'
* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3': Add support for multichannel ATRAC3+ streams. Conflicts: libavformat/oma.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7a28a9f68e
@ -21,6 +21,7 @@
|
|||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "oma.h"
|
#include "oma.h"
|
||||||
#include "libavcodec/avcodec.h"
|
#include "libavcodec/avcodec.h"
|
||||||
|
#include "libavutil/channel_layout.h"
|
||||||
|
|
||||||
const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 };
|
const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 };
|
||||||
|
|
||||||
@ -32,3 +33,16 @@ const AVCodecTag ff_oma_codec_tags[] = {
|
|||||||
{ 0 },
|
{ 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** map ATRAC-X channel id to internal channel layout */
|
||||||
|
const uint64_t ff_oma_chid_to_native_layout[7] = {
|
||||||
|
AV_CH_LAYOUT_MONO,
|
||||||
|
AV_CH_LAYOUT_STEREO,
|
||||||
|
AV_CH_LAYOUT_SURROUND,
|
||||||
|
AV_CH_LAYOUT_4POINT0,
|
||||||
|
AV_CH_LAYOUT_5POINT1_BACK,
|
||||||
|
AV_CH_LAYOUT_6POINT1_BACK,
|
||||||
|
AV_CH_LAYOUT_7POINT1
|
||||||
|
};
|
||||||
|
|
||||||
|
/** map ATRAC-X channel id to total number of channels */
|
||||||
|
const int ff_oma_chid_to_num_channels[7] = {1, 2, 3, 4, 6, 7, 8};
|
||||||
|
@ -41,4 +41,7 @@ extern const uint16_t ff_oma_srate_tab[8];
|
|||||||
|
|
||||||
extern const AVCodecTag ff_oma_codec_tags[];
|
extern const AVCodecTag ff_oma_codec_tags[];
|
||||||
|
|
||||||
|
extern const uint64_t ff_oma_chid_to_native_layout[7];
|
||||||
|
extern const int ff_oma_chid_to_num_channels[7];
|
||||||
|
|
||||||
#endif /* AVFORMAT_OMA_H */
|
#endif /* AVFORMAT_OMA_H */
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Sony OpenMG (OMA) demuxer
|
* Sony OpenMG (OMA) demuxer
|
||||||
*
|
*
|
||||||
* Copyright (c) 2008 Maxim Poliakovski
|
* Copyright (c) 2008, 2013 Maxim Poliakovski
|
||||||
* 2008 Benjamin Larsson
|
* 2008 Benjamin Larsson
|
||||||
* 2011 David Goldwich
|
* 2011 David Goldwich
|
||||||
*
|
*
|
||||||
@ -285,7 +285,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
|
|||||||
static int oma_read_header(AVFormatContext *s)
|
static int oma_read_header(AVFormatContext *s)
|
||||||
{
|
{
|
||||||
int ret, framesize, jsflag, samplerate;
|
int ret, framesize, jsflag, samplerate;
|
||||||
uint32_t codec_params;
|
uint32_t codec_params, channel_id;
|
||||||
int16_t eid;
|
int16_t eid;
|
||||||
uint8_t buf[EA3_HEADER_SIZE];
|
uint8_t buf[EA3_HEADER_SIZE];
|
||||||
uint8_t *edata;
|
uint8_t *edata;
|
||||||
@ -365,7 +365,14 @@ static int oma_read_header(AVFormatContext *s)
|
|||||||
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
|
avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
|
||||||
break;
|
break;
|
||||||
case OMA_CODECID_ATRAC3P:
|
case OMA_CODECID_ATRAC3P:
|
||||||
st->codec->channels = (codec_params >> 10) & 7;
|
channel_id = (codec_params >> 10) & 7;
|
||||||
|
if (!channel_id) {
|
||||||
|
av_log(s, AV_LOG_ERROR,
|
||||||
|
"Invalid ATRAC-X channel id: %d\n", channel_id);
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
}
|
||||||
|
st->codec->channel_layout = ff_oma_chid_to_native_layout[channel_id - 1];
|
||||||
|
st->codec->channels = ff_oma_chid_to_num_channels[channel_id - 1];
|
||||||
framesize = ((codec_params & 0x3FF) * 8) + 8;
|
framesize = ((codec_params & 0x3FF) * 8) + 8;
|
||||||
samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
|
samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100;
|
||||||
if (!samplerate) {
|
if (!samplerate) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user