eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609'

Browse Source 
* commit '50a1c66cf6ab7eb683daaa9e2da3869fa3a54609':
  ac3_parser: add a public function for parsing the data required by the demuxer

avpriv_ac3_parse_header() is left in place but without the
GetBitContext parameter, as the mov muxer requires a lot more fields
than just bitstream_id and frame_size from the AC3HeaderInfo struct.

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-10-27 13:52:19 -03:00
parent 5834cba05e 50a1c66cf6
commit e0250cf365
9 changed files with 149 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/movenc.c
View File

@@ -31,7 +31,7 @@
#include "avio.h"
#include "isom.h"
#include "avc.h"
#include "libavcodec/ac3_parser.h"
#include "libavcodec/ac3_parser_internal.h"
#include "libavcodec/dnxhddata.h"
#include "libavcodec/flac.h"
#include "libavcodec/get_bits.h"
@@ -345,7 +345,6 @@ struct eac3_info {
#if CONFIG_AC3_PARSER
static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
{
GetBitContext gbc;
AC3HeaderInfo tmp, *hdr = &tmp;
struct eac3_info *info;
int num_blocks;
@@ -354,8 +353,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
return AVERROR(ENOMEM);
info = track->eac3_priv;
init_get_bits(&gbc, pkt->data, pkt->size * 8);
if (avpriv_ac3_parse_header(&gbc, &hdr) < 0) {
if (avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0) {
/* drop the packets until we see a good one */
if (!track->entry) {
av_log(mov, AV_LOG_WARNING, "Dropping invalid packet from start of the stream\n");
@@ -403,16 +401,18 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
int parent = hdr->substreamid;
while (cumul_size != pkt->size) {
int i;
init_get_bits(&gbc, pkt->data + cumul_size, (pkt->size - cumul_size) * 8);
if (avpriv_ac3_parse_header(&gbc, &hdr) < 0)
GetBitContext gbc;
int i, ret;
ret = avpriv_ac3_parse_header(&hdr, pkt->data + cumul_size, pkt->size - cumul_size);
if (ret < 0)
return AVERROR_INVALIDDATA;
if (hdr->frame_type != EAC3_FRAME_TYPE_DEPENDENT)
return AVERROR(EINVAL);
cumul_size += hdr->frame_size;
info->substream[parent].num_dep_sub++;
ret /= 8;
/* header is parsed up to lfeon, but custom channel map may be needed */
init_get_bits8(&gbc, pkt->data + cumul_size + ret, pkt->size - cumul_size - ret);
/* skip bsid */
skip_bits(&gbc, 5);
/* skip volume control params */
@@ -427,6 +427,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
info->substream[parent].chan_loc |= (get_bits(&gbc, 16) >> 5) & 0x1f;
else
info->substream[parent].chan_loc |= hdr->channel_mode;
cumul_size += hdr->frame_size;
}
}
}