i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: remove use of deprecated fields in tracing

Browse Source 
Change-Id: Id4f1e342bae8dd4a12b3f6647d60b238f98324e6
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6014
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
PulkoMandy
2023-01-25 11:58:15 +00:00
committed by Adrien Destugues
parent a5bcb6e0e6
commit 83e06e62ef
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
+17 -16
View File
@@ -268,9 +268,8 @@ AVFormatWriter::StreamCookie::Init(media_format* format,
} }
} }
TRACE(" stream->time_base: (%d/%d), codec->time_base: (%d/%d))\n", TRACE(" stream->time_base: (%d/%d)\n",
fStream->time_base.num, fStream->time_base.den, fStream->time_base.num, fStream->time_base.den);
fStream->codec->time_base.num, fStream->codec->time_base.den);
#if 0 #if 0
// Write the AVCodecContext pointer to the user data section of the // Write the AVCodecContext pointer to the user data section of the
@@ -298,7 +297,7 @@ AVFormatWriter::StreamCookie::WriteChunk(const void* chunkBuffer,
size_t chunkSize, media_encode_info* encodeInfo) size_t chunkSize, media_encode_info* encodeInfo)
{ {
TRACE_PACKET("AVFormatWriter::StreamCookie[%d]::WriteChunk(%p, %ld, " TRACE_PACKET("AVFormatWriter::StreamCookie[%d]::WriteChunk(%p, %ld, "
"start_time: %lld)\n", fStream->index, chunkBuffer, chunkSize, "start_time: %" B_PRIdBIGTIME ")\n", fStream->index, chunkBuffer, chunkSize,
encodeInfo->start_time); encodeInfo->start_time);
BAutolock _(fStreamLock); BAutolock _(fStreamLock);
@@ -317,10 +316,8 @@ AVFormatWriter::StreamCookie::WriteChunk(const void* chunkBuffer,
if ((encodeInfo->flags & B_MEDIA_KEY_FRAME) != 0) if ((encodeInfo->flags & B_MEDIA_KEY_FRAME) != 0)
fPacket.flags |= AV_PKT_FLAG_KEY; fPacket.flags |= AV_PKT_FLAG_KEY;
TRACE_PACKET(" PTS: %lld (stream->time_base: (%d/%d), " TRACE_PACKET(" PTS: %" PRId64 " (stream->time_base: (%d/%d)\n", fPacket.pts,
"codec->time_base: (%d/%d))\n", fPacket.pts, fStream->time_base.num, fStream->time_base.den);
fStream->time_base.num, fStream->time_base.den,
fStream->codec->time_base.num, fStream->codec->time_base.den);
#if 0 #if 0
// TODO: Eventually, we need to write interleaved packets, but // TODO: Eventually, we need to write interleaved packets, but
@@ -345,7 +342,7 @@ status_t
AVFormatWriter::StreamCookie::AddTrackInfo(uint32 code, AVFormatWriter::StreamCookie::AddTrackInfo(uint32 code,
const void* data, size_t size, uint32 flags) const void* data, size_t size, uint32 flags)
{ {
TRACE("AVFormatWriter::StreamCookie::AddTrackInfo(%lu, %p, %ld, %lu)\n", TRACE("AVFormatWriter::StreamCookie::AddTrackInfo(%" B_PRIu32 ", %p, %ld, %" B_PRIu32 ")\n",
code, data, size, flags); code, data, size, flags);
BAutolock _(fStreamLock); BAutolock _(fStreamLock);
@@ -452,16 +449,20 @@ AVFormatWriter::CommitHeader()
fCodecOpened = true; fCodecOpened = true;
fHeaderError = avformat_write_header(fFormatContext, NULL); fHeaderError = avformat_write_header(fFormatContext, NULL);
if (fHeaderError < 0)
TRACE(" avformat_write_header(): %d\n", fHeaderError);
#ifdef TRACE_AVFORMAT_WRITER #ifdef TRACE_AVFORMAT_WRITER
TRACE(" wrote header\n"); if (fHeaderError < 0) {
char errorBuffer[AV_ERROR_MAX_STRING_SIZE];
av_strerror(fHeaderError, errorBuffer, sizeof(errorBuffer));
TRACE(" avformat_write_header(): %s\n", errorBuffer);
} else {
TRACE(" wrote header\n");
}
for (unsigned i = 0; i < fFormatContext->nb_streams; i++) { for (unsigned i = 0; i < fFormatContext->nb_streams; i++) {
AVStream* stream = fFormatContext->streams[i]; AVStream* stream = fFormatContext->streams[i];
TRACE(" stream[%u] time_base: (%d/%d), codec->time_base: (%d/%d)\n", TRACE(" stream[%u] time_base: (%d/%d)\n",
i, stream->time_base.num, stream->time_base.den, i, stream->time_base.num, stream->time_base.den);
stream->codec->time_base.num, stream->codec->time_base.den);
} }
#endif // TRACE_AVFORMAT_WRITER #endif // TRACE_AVFORMAT_WRITER
@@ -557,7 +558,7 @@ status_t
AVFormatWriter::AddTrackInfo(void* _cookie, uint32 code, AVFormatWriter::AddTrackInfo(void* _cookie, uint32 code,
const void* data, size_t size, uint32 flags) const void* data, size_t size, uint32 flags)
{ {
TRACE("AVFormatWriter::AddTrackInfo(%lu, %p, %ld, %lu)\n", TRACE("AVFormatWriter::AddTrackInfo(%" B_PRIu32 ", %p, %ld, %" B_PRIu32 ")\n",
code, data, size, flags); code, data, size, flags);
if (fHeaderError != 0) if (fHeaderError != 0)