summaryrefslogtreecommitdiffstats
path: root/libavformat/tests
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-26 16:47:26 -0300
committerJames Almer <jamrial@gmail.com>2017-12-06 15:43:59 -0300
commitd6d605eb05c3ca32f591016c345eb2ad9e81c554 (patch)
tree8d6893a14081c9e60b056b3c2f47cce29abc15c0 /libavformat/tests
parent5a412a5c3cc216ae1d15e6b884bda7214b73a5b0 (diff)
downloadffmpeg-streaming-d6d605eb05c3ca32f591016c345eb2ad9e81c554.zip
ffmpeg-streaming-d6d605eb05c3ca32f591016c345eb2ad9e81c554.tar.gz
avformat/mux: stop delaying writing the header
Every bitstream filter behaves as intended now, so there's no need to wait for the first packet of every stream. Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/tests')
-rw-r--r--libavformat/tests/fifo_muxer.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c
index e20bd6e..4b63df0 100644
--- a/libavformat/tests/fifo_muxer.c
+++ b/libavformat/tests/fifo_muxer.c
@@ -238,54 +238,6 @@ fail:
return ret;
}
-static int fifo_write_header_err_tst(AVFormatContext *oc, AVDictionary **opts,
- const FailingMuxerPacketData *pkt_data)
-{
- int ret = 0, i;
- AVPacket pkt;
-
- av_init_packet(&pkt);
-
- ret = avformat_write_header(oc, opts);
- if (ret) {
- fprintf(stderr, "Unexpected write_header failure: %s\n",
- av_err2str(ret));
- goto fail;
- }
-
- for (i = 0; i < MAX_TST_PACKETS; i++ ) {
- ret = prepare_packet(&pkt, pkt_data, i);
- if (ret < 0) {
- fprintf(stderr, "Failed to prepare test packet: %s\n",
- av_err2str(ret));
- goto write_trailer_and_fail;
- }
- ret = av_write_frame(oc, &pkt);
- av_packet_unref(&pkt);
- if (ret < 0) {
- break;
- }
- }
-
- if (!ret) {
- fprintf(stderr, "write_packet not failed when supposed to.\n");
- goto fail;
- } else if (ret != -1) {
- fprintf(stderr, "Unexpected write_packet error: %s\n", av_err2str(ret));
- goto fail;
- }
-
- ret = av_write_trailer(oc);
- if (ret < 0)
- fprintf(stderr, "Unexpected write_trailer error: %s\n", av_err2str(ret));
-
- return ret;
-write_trailer_and_fail:
- av_write_trailer(oc);
-fail:
- return ret;
-}
-
static int fifo_overflow_drop_test(AVFormatContext *oc, AVDictionary **opts,
const FailingMuxerPacketData *data)
{
@@ -403,10 +355,6 @@ const TestCase tests[] = {
* exactly what was on input */
{fifo_basic_test, "nonfail test", NULL,1, 0, 0, {0, 0, 0}},
- /* Test that we receive delayed write_header error from one of the write_packet
- * calls. */
- {fifo_write_header_err_tst, "write header error test", NULL, 0, -1, 0, {0, 0, 0}},
-
/* Each write_packet will fail 3 times before operation is successful. If recovery
* Since recovery is on, fifo muxer should not return any errors. */
{fifo_basic_test, "recovery test", "attempt_recovery=1:recovery_wait_time=0",
OpenPOWER on IntegriCloud