fprintf(stderr, " ($DISPLAY spec or /dev/dri/render* path)\n");
fprintf(stderr, " --http-uncompressed-video send uncompressed NV12 video to HTTP clients\n");
fprintf(stderr, " --http-mux=NAME mux to use for HTTP streams (default " DEFAULT_STREAM_MUX_NAME ")\n");
+ fprintf(stderr, " --http-coarse-timebase use less timebase for HTTP (recommended for muxers\n");
+ fprintf(stderr, " that handle large pts poorly, like e.g. MP4)\n");
fprintf(stderr, " --flat-audio start with most audio processing turned off\n");
fprintf(stderr, " --no-flush-pbos do not explicitly signal texture data uploads\n");
fprintf(stderr, " (will give display corruption, but makes it\n");
{ "va-display", required_argument, 0, 1000 },
{ "http-uncompressed-video", no_argument, 0, 1001 },
{ "http-mux", required_argument, 0, 1004 },
+ { "http-coarse-timebase", no_argument, 0, 1005 },
{ "flat-audio", no_argument, 0, 1002 },
{ "no-flush-pbos", no_argument, 0, 1003 },
{ 0, 0, 0, 0 }
case 1004:
global_flags.stream_mux_name = optarg;
break;
+ case 1005:
+ global_flags.stream_coarse_timebase = true;
+ break;
case 1002:
global_flags.flat_audio = true;
break;
exit(1);
}
- file_mux.reset(new Mux(avctx, width, height, Mux::CODEC_H264));
+ file_mux.reset(new Mux(avctx, width, height, Mux::CODEC_H264, TIMEBASE));
}
void HTTPD::close_output_file()
{
AVOutputFormat *oformat = av_guess_format(global_flags.stream_mux_name.c_str(), nullptr, nullptr);
assert(oformat != nullptr);
- HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height);
+
+ int time_base = global_flags.stream_coarse_timebase ? COARSE_TIMEBASE : TIMEBASE;
+ HTTPD::Stream *stream = new HTTPD::Stream(oformat, width, height, time_base);
{
unique_lock<mutex> lock(streams_mutex);
streams.insert(stream);
}
}
-HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec)
+HTTPD::Mux::Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, int time_base)
: avctx(avctx)
{
AVCodec *codec_video = avcodec_find_encoder((video_codec == CODEC_H264) ? AV_CODEC_ID_H264 : AV_CODEC_ID_RAWVIDEO);
fprintf(stderr, "avformat_new_stream() failed\n");
exit(1);
}
- avstream_video->time_base = AVRational{1, TIMEBASE};
+ avstream_video->time_base = AVRational{1, time_base};
avstream_video->codec->codec_type = AVMEDIA_TYPE_VIDEO;
if (video_codec == CODEC_H264) {
avstream_video->codec->codec_id = AV_CODEC_ID_H264;
}
avstream_video->codec->width = width;
avstream_video->codec->height = height;
- avstream_video->codec->time_base = AVRational{1, TIMEBASE};
+ avstream_video->codec->time_base = AVRational{1, time_base};
avstream_video->codec->ticks_per_frame = 1; // or 2?
// Colorspace details. Closely correspond to settings in EffectChain_finalize,
fprintf(stderr, "avformat_new_stream() failed\n");
exit(1);
}
- avstream_audio->time_base = AVRational{1, TIMEBASE};
+ avstream_audio->time_base = AVRational{1, time_base};
avstream_audio->codec->bit_rate = AUDIO_OUTPUT_BIT_RATE;
avstream_audio->codec->sample_rate = OUTPUT_FREQUENCY;
avstream_audio->codec->sample_fmt = AUDIO_OUTPUT_SAMPLE_FMT;
avstream_audio->codec->channels = 2;
avstream_audio->codec->channel_layout = AV_CH_LAYOUT_STEREO;
- avstream_audio->codec->time_base = AVRational{1, TIMEBASE};
+ avstream_audio->codec->time_base = AVRational{1, time_base};
if (avctx->oformat->flags & AVFMT_GLOBALHEADER) {
avstream_audio->codec->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
}
av_packet_unref(&pkt_copy);
}
-HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height)
+HTTPD::Stream::Stream(AVOutputFormat *oformat, int width, int height, int time_base)
{
AVFormatContext *avctx = avformat_alloc_context();
avctx->oformat = oformat;
avctx->flags = AVFMT_FLAG_CUSTOM_IO;
- mux.reset(new Mux(avctx, width, height, video_codec));
+ mux.reset(new Mux(avctx, width, height, video_codec, time_base));
}
ssize_t HTTPD::Stream::reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max)
CODEC_NV12, // Uncompressed 4:2:0.
};
- Mux(AVFormatContext *avctx, int width, int height, Codec video_codec); // Takes ownership of avctx.
+ Mux(AVFormatContext *avctx, int width, int height, Codec video_codec, int time_base); // Takes ownership of avctx.
~Mux();
void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
class Stream {
public:
- Stream(AVOutputFormat *oformat, int width, int height);
+ Stream(AVOutputFormat *oformat, int width, int height, int time_base);
static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
ssize_t reader_callback(uint64_t pos, char *buf, size_t max);