From 22e28216336da876e1fd17f380ce42eaf1446769 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Mon, 17 Feb 2014 13:36:38 +0000 Subject: chasing indexing error --- ffmpeg/libavformat/oggparseskeleton.c | 102 ---------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 ffmpeg/libavformat/oggparseskeleton.c (limited to 'ffmpeg/libavformat/oggparseskeleton.c') diff --git a/ffmpeg/libavformat/oggparseskeleton.c b/ffmpeg/libavformat/oggparseskeleton.c deleted file mode 100644 index d94b0c2..0000000 --- a/ffmpeg/libavformat/oggparseskeleton.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * 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; - uint64_t start_granule; - int target_idx, start_time; - - strcpy(st->codec->codec_name, "skeleton"); - st->codec->codec_type = AVMEDIA_TYPE_DATA; - - if ((os->flags & OGG_FLAG_EOS) && os->psize == 0) - return 1; - - 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 > 0 && start_num > 0) { - 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) { - av_log(s, AV_LOG_WARNING, "Serial number in fisbone doesn't match any stream\n"); - return 1; - } - os = ogg->streams + target_idx; - if (os->start_granule != OGG_NOGRANULE_VALUE) { - av_log(s, AV_LOG_WARNING, "Multiple fisbone for the same stream\n"); - return 1; - } - if (start_granule != OGG_NOGRANULE_VALUE) { - os->start_granule = start_granule; - } - } - - return 1; -} - -const struct ogg_codec ff_skeleton_codec = { - .magic = "fishead", - .magicsize = 8, - .header = skeleton_header, - .nb_header = 0, -}; -- cgit v1.2.3