generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'

Browse Source 
* commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48':
  oggparsevorbis: K&R formatting cosmetics

Conflicts:
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-10-04 12:01:17 +02:00
parent 90e1fc8bec 49fe9c05f9
commit f3968ab47c
1 changed files with 83 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
libavformat/oggparsevorbis.c
View File

@@ -1,34 +1,35 @@
/** /*
Copyright (C) 2005 Michael Ahlberg, Måns Rullgård * Copyright (C) 2005 Michael Ahlberg, Måns Rullgård
*
Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without * files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy, * restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies * modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is * of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: * furnished to do so, subject to the following conditions:
*
The above copyright notice and this permission notice shall be * The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software. * included in all copies or substantial portions of the Software.
*
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
**/ */
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/base64.h" #include "libavutil/base64.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/vorbis_parser.h" #include "libavcodec/vorbis_parser.h"
#include "avformat.h" #include "avformat.h"
#include "flacdec.h" #include "flacdec.h"
@@ -61,8 +62,7 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
if (!chapter) if (!chapter)
return 0; return 0;
av_dict_set(&chapter->metadata, "title", val, av_dict_set(&chapter->metadata, "title", val, AV_DICT_DONT_STRDUP_VAL);
AV_DICT_DONT_STRDUP_VAL);
} else } else
return 0; return 0;
@@ -70,15 +70,16 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
return 1; return 1;
} }
int int ff_vorbis_comment(AVFormatContext *as, AVDictionary **m,
ff_vorbis_comment(AVFormatContext * as, AVDictionary **m, const uint8_t *buf, int size) const uint8_t *buf, int size)
{ {
const uint8_t *p = buf; const uint8_t *p = buf;
const uint8_t *end = buf + size; const uint8_t *end = buf + size;
unsigned n, j; unsigned n, j;
int s; int s;
if (size < 8) /* must have vendor_length and user_comment_list_length */ /* must have vendor_length and user_comment_list_length */
if (size < 8)
return -1; return -1;
s = bytestream_get_le32(&p); s = bytestream_get_le32(&p);
@@ -119,7 +120,8 @@ ff_vorbis_comment(AVFormatContext * as, AVDictionary **m, const uint8_t *buf, in
if (!tt || !ct) { if (!tt || !ct) {
av_freep(&tt); av_freep(&tt);
av_freep(&ct); av_freep(&ct);
av_log(as, AV_LOG_WARNING, "out-of-memory error. skipping VorbisComment tag.\n"); av_log(as, AV_LOG_WARNING,
"out-of-memory error. skipping VorbisComment tag.\n");
continue; continue;
} }
@@ -157,7 +159,8 @@ ff_vorbis_comment(AVFormatContext * as, AVDictionary **m, const uint8_t *buf, in
} }
if (p != end) if (p != end)
av_log(as, AV_LOG_INFO, "%ti bytes of comment header remain\n", end-p); av_log(as, AV_LOG_INFO,
"%ti bytes of comment header remain\n", end - p);
if (n > 0) if (n > 0)
av_log(as, AV_LOG_INFO, av_log(as, AV_LOG_INFO,
"truncated comment header, %i comments not found\n", n); "truncated comment header, %i comments not found\n", n);
@@ -167,8 +170,9 @@ ff_vorbis_comment(AVFormatContext * as, AVDictionary **m, const uint8_t *buf, in
return 0; return 0;
} }
/*
/** Parse the vorbis header * Parse the vorbis header
*
* Vorbis Identification header from Vorbis_I_spec.html#vorbis-spec-codec * Vorbis Identification header from Vorbis_I_spec.html#vorbis-spec-codec
* [vorbis_version] = read 32 bits as unsigned integer | Not used * [vorbis_version] = read 32 bits as unsigned integer | Not used
* [audio_channels] = read 8 bit integer as unsigned | Used * [audio_channels] = read 8 bit integer as unsigned | Used
@@ -179,7 +183,7 @@ ff_vorbis_comment(AVFormatContext * as, AVDictionary **m, const uint8_t *buf, in
* [blocksize_0] = read 4 bits as unsigned integer | Not Used * [blocksize_0] = read 4 bits as unsigned integer | Not Used
* [blocksize_1] = read 4 bits as unsigned integer | Not Used * [blocksize_1] = read 4 bits as unsigned integer | Not Used
* [framing_flag] = read one bit | Not Used * [framing_flag] = read one bit | Not Used
* */ */
struct oggvorbis_private { struct oggvorbis_private {
unsigned int len[3]; unsigned int len[3];
@@ -189,9 +193,8 @@ struct oggvorbis_private {
int final_duration; int final_duration;
}; };
static unsigned int fixup_vorbis_headers(AVFormatContext *as,
static unsigned int struct oggvorbis_private *priv,
fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv,
uint8_t **buf) uint8_t **buf)
{ {
int i, offset, len, err; int i, offset, len, err;
@@ -230,12 +233,11 @@ static void vorbis_cleanup(AVFormatContext *s, int idx)
av_freep(&priv->packet[i]); av_freep(&priv->packet[i]);
} }
static int static int vorbis_header(AVFormatContext *s, int idx)
vorbis_header (AVFormatContext * s, int idx)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
AVStream *st = s->streams[idx]; AVStream *st = s->streams[idx];
struct ogg_stream *os = ogg->streams + idx;
struct oggvorbis_private *priv; struct oggvorbis_private *priv;
int pkt_type = os->buf[os->pstart]; int pkt_type = os->buf[os->pstart];
@@ -307,7 +309,8 @@ vorbis_header (AVFormatContext * s, int idx)
} }
} else if (os->buf[os->pstart] == 3) { } else if (os->buf[os->pstart] == 3) {
if (os->psize > 8 && if (os->psize > 8 &&
ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 8) >= 0) { ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7,
os->psize - 8) >= 0) {
// drop all metadata we parsed and which is not required by libvorbis // drop all metadata we parsed and which is not required by libvorbis
unsigned new_len = 7 + 4 + AV_RL32(priv->packet[1] + 7) + 4 + 1; unsigned new_len = 7 + 4 + AV_RL32(priv->packet[1] + 7) + 4 + 1;
if (new_len >= 16 && new_len < os->psize) { if (new_len >= 16 && new_len < os->psize) {
@@ -341,9 +344,9 @@ static int vorbis_packet(AVFormatContext *s, int idx)
int duration; int duration;
/* first packet handling /* first packet handling
here we parse the duration of each packet in the first page and compare * here we parse the duration of each packet in the first page and compare
the total duration to the page granule to find the encoder delay and * the total duration to the page granule to find the encoder delay and
set the first timestamp */ * set the first timestamp */
if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) { if ((!os->lastpts || os->lastpts == AV_NOPTS_VALUE) && !(os->flags & OGG_FLAG_EOS)) {
int seg, d; int seg, d;
uint8_t *last_pkt = os->buf + os->pstart; uint8_t *last_pkt = os->buf + os->pstart;
@@ -371,7 +374,8 @@ static int vorbis_packet(AVFormatContext *s, int idx)
} }
next_pkt += os->segments[seg]; next_pkt += os->segments[seg];
} }
os->lastpts = os->lastdts = os->granule - duration; os->lastpts =
os->lastdts = os->granule - duration;
if (s->streams[idx]->start_time == AV_NOPTS_VALUE) { if (s->streams[idx]->start_time == AV_NOPTS_VALUE) {
s->streams[idx]->start_time = FFMAX(os->lastpts, 0); s->streams[idx]->start_time = FFMAX(os->lastpts, 0);
if (s->streams[idx]->duration) if (s->streams[idx]->duration)
@@ -392,9 +396,9 @@ static int vorbis_packet(AVFormatContext *s, int idx)
} }
/* final packet handling /* final packet handling
here we save the pts of the first packet in the final page, sum up all * here we save the pts of the first packet in the final page, sum up all
packet durations in the final page except for the last one, and compare * packet durations in the final page except for the last one, and compare
to the page granule to find the duration of the final packet */ * to the page granule to find the duration of the final packet */
if (os->flags & OGG_FLAG_EOS) { if (os->flags & OGG_FLAG_EOS) {
if (os->lastpts != AV_NOPTS_VALUE) { if (os->lastpts != AV_NOPTS_VALUE) {
priv->final_pts = os->lastpts; priv->final_pts = os->lastpts;