mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-30 06:50:44 +00:00
46a35959d8
* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
94 lines
3.0 KiB
C
94 lines
3.0 KiB
C
/*
|
|
* Copyright (C) 2010 David Conrad
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "libavcodec/bytestream.h"
|
|
#include "avformat.h"
|
|
#include "internal.h"
|
|
#include "oggdec.h"
|
|
|
|
static int skeleton_header(AVFormatContext *s, int idx)
|
|
{
|
|
struct ogg *ogg = s->priv_data;
|
|
struct ogg_stream *os = ogg->streams + idx;
|
|
AVStream *st = s->streams[idx];
|
|
uint8_t *buf = os->buf + os->pstart;
|
|
int version_major, version_minor;
|
|
int64_t start_num, start_den, start_granule;
|
|
int target_idx, start_time;
|
|
|
|
strcpy(st->codec->codec_name, "skeleton");
|
|
st->codec->codec_type = AVMEDIA_TYPE_DATA;
|
|
|
|
if (os->psize < 8)
|
|
return -1;
|
|
|
|
if (!strncmp(buf, "fishead", 8)) {
|
|
if (os->psize < 64)
|
|
return -1;
|
|
|
|
version_major = AV_RL16(buf+8);
|
|
version_minor = AV_RL16(buf+10);
|
|
|
|
if (version_major != 3 && version_major != 4) {
|
|
av_log(s, AV_LOG_WARNING, "Unknown skeleton version %d.%d\n",
|
|
version_major, version_minor);
|
|
return -1;
|
|
}
|
|
|
|
// This is the overall start time. We use it for the start time of
|
|
// of the skeleton stream since if left unset lavf assumes 0,
|
|
// which we don't want since skeleton is timeless
|
|
// FIXME: the real meaning of this field is "start playback at
|
|
// this time which can be in the middle of a packet
|
|
start_num = AV_RL64(buf+12);
|
|
start_den = AV_RL64(buf+20);
|
|
|
|
if (start_den) {
|
|
int base_den;
|
|
av_reduce(&start_time, &base_den, start_num, start_den, INT_MAX);
|
|
avpriv_set_pts_info(st, 64, 1, base_den);
|
|
os->lastpts =
|
|
st->start_time = start_time;
|
|
}
|
|
} else if (!strncmp(buf, "fisbone", 8)) {
|
|
if (os->psize < 52)
|
|
return -1;
|
|
|
|
target_idx = ogg_find_stream(ogg, AV_RL32(buf+12));
|
|
start_granule = AV_RL64(buf+36);
|
|
if (target_idx >= 0 && start_granule != -1) {
|
|
int64_t pts = ogg_gptopts(s, target_idx, start_granule, NULL);
|
|
if (pts == AV_NOPTS_VALUE)
|
|
return -1;
|
|
ogg->streams[target_idx].lastpts =
|
|
s->streams[target_idx]->start_time = pts;
|
|
}
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
const struct ogg_codec ff_skeleton_codec = {
|
|
.magic = "fishead",
|
|
.magicsize = 8,
|
|
.header = skeleton_header,
|
|
.nb_header = 0,
|
|
};
|