jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation on 32bits

Browse Source
This commit is contained in:
Kamil Trzcinski 2022-07-05 07:40:10 +00:00
parent ff95a28977
commit 981eb459ed
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -43,7 +43,7 @@ reboot
## Compile ## Compile
```bash ```bash
apt-get -y install libavformat-dev libavutil-dev libavcodec-dev libcamera-dev v4l-utils pkg-config build-essential apt-get -y install libavformat-dev libavutil-dev libavcodec-dev libcamera-dev v4l-utils pkg-config xxd build-essential
make make
sudo make install sudo make install
``` ```

10
ffmpeg/remuxer.c
View File

@ -1,6 +1,8 @@
#include "ffmpeg/remuxer.h" #include "ffmpeg/remuxer.h"
#include "opts/log.h" #include "opts/log.h"
#include <inttypes.h>
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
static AVRational time_base = {1, 1000LL * 1000LL}; static AVRational time_base = {1, 1000LL * 1000LL};
static unsigned avio_ctx_buffer_size = 4096; static unsigned avio_ctx_buffer_size = 4096;
@ -143,7 +145,7 @@ int ffmpeg_remuxer_feed(ffmpeg_remuxer_t *remuxer, int nframes)
LOG_DEBUG(remuxer, "av_read_frame: EOF"); LOG_DEBUG(remuxer, "av_read_frame: EOF");
break; break;
} else if (ret < 0) { } else if (ret < 0) {
LOG_DEBUG(remuxer, "av_read_frame: %08x, pts: %ld", ret, remuxer->packet->pts); LOG_DEBUG(remuxer, "av_read_frame: %08x, pts: %" PRId64, ret, remuxer->packet->pts);
break; break;
} }
@ -162,7 +164,7 @@ int ffmpeg_remuxer_feed(ffmpeg_remuxer_t *remuxer, int nframes)
// TODO: fix a PTS to be valid // TODO: fix a PTS to be valid
remuxer->packet->pos = -1; remuxer->packet->pos = -1;
int pts = remuxer->packet->dts = remuxer->packet->pts = av_rescale_q( int64_t pts = remuxer->packet->dts = remuxer->packet->pts = av_rescale_q(
get_monotonic_time_us(NULL, NULL) - remuxer->start_time, get_monotonic_time_us(NULL, NULL) - remuxer->start_time,
time_base, time_base,
out_stream->time_base out_stream->time_base
@ -172,9 +174,9 @@ int ffmpeg_remuxer_feed(ffmpeg_remuxer_t *remuxer, int nframes)
av_packet_unref(remuxer->packet); av_packet_unref(remuxer->packet);
if (ret == AVERROR_EOF) { if (ret == AVERROR_EOF) {
LOG_DEBUG(remuxer, "av_interleaved_write_frame: EOF, pts: %d, since_start: %d", pts, since_start); LOG_DEBUG(remuxer, "av_interleaved_write_frame: EOF, pts: %" PRId64 ", since_start: %d", pts, since_start);
} else { } else {
LOG_DEBUG(remuxer, "av_interleaved_write_frame: %08x, pts: %d, since_start: %d", ret, pts, since_start); LOG_DEBUG(remuxer, "av_interleaved_write_frame: %08x, pts: %" PRId64 ", since_start: %d", ret, pts, since_start);
} }
} }