Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Rescale packet timestamp to container time base

Browse source 
Some containers force their own time base. For example, matroska
overwrite time_base to (AVRational) {1, 1000}.

Therefore, rescale our packet timestamps to the output stream time base.

Suggested-by: Steve Lhomme <robux4@ycbcr.xyz>
This commit is contained in:
Romain Vimont 2019-02-09 15:08:36 +01:00
parent c8f0805b89
commit 1aaad6ba35
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/recorder.c
View file

@ -15,6 +15,8 @@
# define LAVF_NEW_CODEC_API # define LAVF_NEW_CODEC_API
#endif #endif
static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us
static const AVOutputFormat *find_mp4_muxer(void) { static const AVOutputFormat *find_mp4_muxer(void) {
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100) #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100)
void *opaque = NULL; void *opaque = NULL;
@ -87,7 +89,6 @@ SDL_bool recorder_open(struct recorder *recorder, AVCodec *input_codec) {
ostream->codec->width = recorder->declared_frame_size.width; ostream->codec->width = recorder->declared_frame_size.width;
ostream->codec->height = recorder->declared_frame_size.height; ostream->codec->height = recorder->declared_frame_size.height;
#endif #endif
ostream->time_base = (AVRational) {1, 1000000}; // timestamps in us
int ret = avio_open(&recorder->ctx->pb, recorder->filename, int ret = avio_open(&recorder->ctx->pb, recorder->filename,
AVIO_FLAG_WRITE); AVIO_FLAG_WRITE);
@ -143,6 +144,12 @@ recorder_write_header(struct recorder *recorder, AVPacket *packet) {
return SDL_TRUE; return SDL_TRUE;
} }
static void
recorder_rescale_packet(struct recorder *recorder, AVPacket *packet) {
AVStream *ostream = recorder->ctx->streams[0];
av_packet_rescale_ts(packet, SCRCPY_TIME_BASE, ostream->time_base);
}
SDL_bool recorder_write(struct recorder *recorder, AVPacket *packet) { SDL_bool recorder_write(struct recorder *recorder, AVPacket *packet) {
if (!recorder->header_written) { if (!recorder->header_written) {
SDL_bool ok = recorder_write_header(recorder, packet); SDL_bool ok = recorder_write_header(recorder, packet);
@ -152,5 +159,6 @@ SDL_bool recorder_write(struct recorder *recorder, AVPacket *packet) {
recorder->header_written = SDL_TRUE; recorder->header_written = SDL_TRUE;
} }
recorder_rescale_packet(recorder, packet);
return av_write_frame(recorder->ctx, packet) >= 0; return av_write_frame(recorder->ctx, packet) >= 0;
} }