mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: Add a tool that uses avio to read and write, doing a plain copy of data ARM: fix build with FFT enabled and MDCT disabled lavf: force single-threaded decoding in avformat_find_stream_info avidec: migrate last of lavf from FF_ER_* to AV_EF_* avserver: fix build after the next bump. Conflicts: libavformat/Makefile libavformat/avidec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8f0768cc22
22
ffserver.c
22
ffserver.c
@ -30,13 +30,16 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "libavformat/avformat.h"
|
||||
// FIXME those are internal headers, avserver _really_ shouldn't use them
|
||||
#include "libavformat/ffm.h"
|
||||
#include "libavformat/network.h"
|
||||
#include "libavformat/os_support.h"
|
||||
#include "libavformat/rtpdec.h"
|
||||
#include "libavformat/rtsp.h"
|
||||
// XXX for ffio_open_dyn_packet_buffer, to be removed
|
||||
#include "libavformat/avio_internal.h"
|
||||
#include "libavformat/internal.h"
|
||||
#include "libavformat/url.h"
|
||||
|
||||
#include "libavutil/avstring.h"
|
||||
#include "libavutil/lfg.h"
|
||||
#include "libavutil/dict.h"
|
||||
@ -874,7 +877,7 @@ static void close_connection(HTTPContext *c)
|
||||
}
|
||||
h = c->rtp_handles[i];
|
||||
if (h)
|
||||
url_close(h);
|
||||
ffurl_close(h);
|
||||
}
|
||||
|
||||
ctx = &c->fmt_ctx;
|
||||
@ -2255,7 +2258,6 @@ static int http_prepare_data(HTTPContext *c)
|
||||
* Default value from FFmpeg
|
||||
* Try to set it use configuration option
|
||||
*/
|
||||
c->fmt_ctx.preload = (int)(0.5*AV_TIME_BASE);
|
||||
c->fmt_ctx.max_delay = (int)(0.7*AV_TIME_BASE);
|
||||
|
||||
if (avformat_write_header(&c->fmt_ctx, NULL) < 0) {
|
||||
@ -2374,7 +2376,7 @@ static int http_prepare_data(HTTPContext *c)
|
||||
if (c->rtp_protocol == RTSP_LOWER_TRANSPORT_TCP)
|
||||
max_packet_size = RTSP_TCP_MAX_PACKET_SIZE;
|
||||
else
|
||||
max_packet_size = url_get_max_packet_size(c->rtp_handles[c->packet_stream_index]);
|
||||
max_packet_size = c->rtp_handles[c->packet_stream_index]->max_packet_size;
|
||||
ret = ffio_open_dyn_packet_buf(&ctx->pb, max_packet_size);
|
||||
} else {
|
||||
ret = avio_open_dyn_buf(&ctx->pb);
|
||||
@ -2527,8 +2529,8 @@ static int http_send_data(HTTPContext *c)
|
||||
} else {
|
||||
/* send RTP packet directly in UDP */
|
||||
c->buffer_ptr += 4;
|
||||
url_write(c->rtp_handles[c->packet_stream_index],
|
||||
c->buffer_ptr, len);
|
||||
ffurl_write(c->rtp_handles[c->packet_stream_index],
|
||||
c->buffer_ptr, len);
|
||||
c->buffer_ptr += len;
|
||||
/* here we continue as we can send several packets per 10 ms slot */
|
||||
}
|
||||
@ -3411,10 +3413,10 @@ static int rtp_new_av_stream(HTTPContext *c,
|
||||
"rtp://%s:%d", ipaddr, ntohs(dest_addr->sin_port));
|
||||
}
|
||||
|
||||
if (url_open(&h, ctx->filename, AVIO_FLAG_WRITE) < 0)
|
||||
if (ffurl_open(&h, ctx->filename, AVIO_FLAG_WRITE, NULL, NULL) < 0)
|
||||
goto fail;
|
||||
c->rtp_handles[stream_index] = h;
|
||||
max_packet_size = url_get_max_packet_size(h);
|
||||
max_packet_size = h->max_packet_size;
|
||||
break;
|
||||
case RTSP_LOWER_TRANSPORT_TCP:
|
||||
/* RTP/TCP case */
|
||||
@ -3437,7 +3439,7 @@ static int rtp_new_av_stream(HTTPContext *c,
|
||||
if (avformat_write_header(ctx, NULL) < 0) {
|
||||
fail:
|
||||
if (h)
|
||||
url_close(h);
|
||||
ffurl_close(h);
|
||||
av_free(ctx);
|
||||
return -1;
|
||||
}
|
||||
@ -3474,7 +3476,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
|
||||
}
|
||||
fst->priv_data = av_mallocz(sizeof(FeedData));
|
||||
fst->index = stream->nb_streams;
|
||||
av_set_pts_info(fst, 33, 1, 90000);
|
||||
avpriv_set_pts_info(fst, 33, 1, 90000);
|
||||
fst->sample_aspect_ratio = codec->sample_aspect_ratio;
|
||||
stream->streams[stream->nb_streams++] = fst;
|
||||
return fst;
|
||||
|
@ -42,10 +42,12 @@ av_cold void ff_fft_init_arm(FFTContext *s)
|
||||
if (HAVE_NEON) {
|
||||
s->fft_permute = ff_fft_permute_neon;
|
||||
s->fft_calc = ff_fft_calc_neon;
|
||||
#if CONFIG_MDCT
|
||||
s->imdct_calc = ff_imdct_calc_neon;
|
||||
s->imdct_half = ff_imdct_half_neon;
|
||||
s->mdct_calc = ff_mdct_calc_neon;
|
||||
s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -374,4 +374,4 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
|
||||
|
||||
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
|
||||
TESTPROGS = seek
|
||||
TOOLS = pktdumper probetest
|
||||
TOOLS = aviocat pktdumper probetest
|
||||
|
@ -724,8 +724,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||
case MKTAG('i', 'n', 'd', 'x'):
|
||||
i= avio_tell(pb);
|
||||
if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && avi->use_odml &&
|
||||
read_braindead_odml_indx(s, 0) < 0 && s->error_recognition >= FF_ER_EXPLODE){
|
||||
goto fail; }
|
||||
read_braindead_odml_indx(s, 0) < 0 && s->error_recognition >= FF_ER_EXPLODE)
|
||||
goto fail;
|
||||
avio_seek(pb, i+size, SEEK_SET);
|
||||
break;
|
||||
case MKTAG('v', 'p', 'r', 'p'):
|
||||
@ -762,7 +762,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
||||
if(size > 1000000){
|
||||
av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, "
|
||||
"I will ignore it and try to continue anyway.\n");
|
||||
if (s->error_recognition >= FF_ER_EXPLODE) goto fail;
|
||||
if (s->error_recognition & AV_EF_EXPLODE)
|
||||
goto fail;
|
||||
avi->movi_list = avio_tell(pb) - 4;
|
||||
avi->movi_end = avi->fsize;
|
||||
goto end_of_header;
|
||||
|
@ -2244,10 +2244,18 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option
|
||||
AVPacket pkt = *avpkt;
|
||||
|
||||
if(!st->codec->codec){
|
||||
AVDictionary *thread_opt = NULL;
|
||||
|
||||
codec = avcodec_find_decoder(st->codec->codec_id);
|
||||
if (!codec)
|
||||
return -1;
|
||||
ret = avcodec_open2(st->codec, codec, options);
|
||||
|
||||
/* force thread count to 1 since the h264 decoder will not extract SPS
|
||||
* and PPS to extradata during multi-threaded decoding */
|
||||
av_dict_set(options ? options : &thread_opt, "threads", "1", 0);
|
||||
ret = avcodec_open2(st->codec, codec, options ? options : &thread_opt);
|
||||
if (!options)
|
||||
av_dict_free(&thread_opt);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
@ -2384,15 +2392,13 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
int i, count, ret, read_size, j;
|
||||
AVStream *st;
|
||||
AVPacket pkt1, *pkt;
|
||||
AVDictionary *one_thread_opt = NULL;
|
||||
int64_t old_offset = avio_tell(ic->pb);
|
||||
int orig_nb_streams = ic->nb_streams; // new streams might appear, no options for those
|
||||
int flush_codecs = 1;
|
||||
|
||||
av_dict_set(&one_thread_opt, "threads", "1", 0);
|
||||
|
||||
for(i=0;i<ic->nb_streams;i++) {
|
||||
AVCodec *codec;
|
||||
AVDictionary *thread_opt = NULL;
|
||||
st = ic->streams[i];
|
||||
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
|
||||
@ -2412,20 +2418,24 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
assert(!st->codec->codec);
|
||||
codec = avcodec_find_decoder(st->codec->codec_id);
|
||||
|
||||
if (options)
|
||||
av_dict_set(&options[i], "threads", "1", 0);
|
||||
/* force thread count to 1 since the h264 decoder will not extract SPS
|
||||
* and PPS to extradata during multi-threaded decoding */
|
||||
av_dict_set(options ? &options[i] : &thread_opt, "threads", "1", 0);
|
||||
|
||||
/* Ensure that subtitle_header is properly set. */
|
||||
if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE
|
||||
&& codec && !st->codec->codec)
|
||||
avcodec_open2(st->codec, codec, options ? &options[i] : &one_thread_opt);
|
||||
avcodec_open2(st->codec, codec, options ? &options[i]
|
||||
: &thread_opt);
|
||||
|
||||
//try to just open decoders, in case this is enough to get parameters
|
||||
if(!has_codec_parameters(st->codec)){
|
||||
if (codec && !st->codec->codec)
|
||||
avcodec_open2(st->codec, codec, options ? &options[i]
|
||||
: &one_thread_opt);
|
||||
: &thread_opt);
|
||||
}
|
||||
if (!options)
|
||||
av_dict_free(&thread_opt);
|
||||
}
|
||||
|
||||
for (i=0; i<ic->nb_streams; i++) {
|
||||
@ -2715,8 +2725,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
ic->streams[i]->codec->thread_count = 0;
|
||||
av_freep(&ic->streams[i]->info);
|
||||
}
|
||||
|
||||
av_dict_free(&one_thread_opt);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
97
tools/aviocat.c
Normal file
97
tools/aviocat.c
Normal file
@ -0,0 +1,97 @@
|
||||
/*
|
||||
* Copyright (c) 2012 Martin Storsjo
|
||||
*
|
||||
* This file is part of Libav.
|
||||
*
|
||||
* Libav 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.
|
||||
*
|
||||
* Libav 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 Libav; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include "libavformat/avformat.h"
|
||||
#include "libavformat/riff.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/mathematics.h"
|
||||
|
||||
static int usage(const char *argv0, int ret)
|
||||
{
|
||||
fprintf(stderr, "%s [-b bytespersec] input_url output_url\n", argv0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int bps = 0, ret, i;
|
||||
const char *input_url = NULL, *output_url = NULL;
|
||||
int64_t stream_pos = 0;
|
||||
int64_t start_time;
|
||||
char errbuf[50];
|
||||
AVIOContext *input, *output;
|
||||
|
||||
av_register_all();
|
||||
avformat_network_init();
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (!strcmp(argv[i], "-b")) {
|
||||
bps = atoi(argv[i + 1]);
|
||||
i++;
|
||||
} else if (!input_url) {
|
||||
input_url = argv[i];
|
||||
} else if (!output_url) {
|
||||
output_url = argv[i];
|
||||
} else {
|
||||
return usage(argv[0], 1);
|
||||
}
|
||||
}
|
||||
if (!output_url)
|
||||
return usage(argv[0], 1);
|
||||
|
||||
ret = avio_open2(&input, input_url, AVIO_FLAG_READ, NULL, NULL);
|
||||
if (ret) {
|
||||
av_strerror(ret, errbuf, sizeof(errbuf));
|
||||
fprintf(stderr, "Unable to open %s: %s\n", input_url, errbuf);
|
||||
return 1;
|
||||
}
|
||||
ret = avio_open2(&output, output_url, AVIO_FLAG_WRITE, NULL, NULL);
|
||||
if (ret) {
|
||||
av_strerror(ret, errbuf, sizeof(errbuf));
|
||||
fprintf(stderr, "Unable to open %s: %s\n", output_url, errbuf);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
start_time = av_gettime();
|
||||
while (1) {
|
||||
uint8_t buf[1024];
|
||||
int n;
|
||||
n = avio_read(input, buf, sizeof(buf));
|
||||
if (n <= 0)
|
||||
break;
|
||||
avio_write(output, buf, n);
|
||||
stream_pos += n;
|
||||
if (bps) {
|
||||
avio_flush(output);
|
||||
while ((av_gettime() - start_time)*bps/AV_TIME_BASE < stream_pos)
|
||||
usleep(50*1000);
|
||||
}
|
||||
}
|
||||
|
||||
avio_close(output);
|
||||
fail:
|
||||
avio_close(input);
|
||||
avformat_network_deinit();
|
||||
return ret ? 1 : 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user