rename some macros so it doesn't clash with others (#510)

* rename macros so not to clash with others

* modified macro in all samples
Этот коммит содержится в:
Rajy Rawther
2025-02-18 05:40:58 -08:00
коммит произвёл GitHub
родитель 2af7bbf4e7
Коммит c4fe8f5258
7 изменённых файлов: 24 добавлений и 28 удалений
+4 -4
Просмотреть файл
@@ -92,7 +92,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(int device_id, OutputSurfaceMemoryType ou
RocVideoDecoder(device_id, out_mem_type, codec, force_zero_latency, p_crop_rect, extract_user_sei_Message, disp_delay, max_width, max_height, clk_rate), no_multithreading_(no_multithreading) {
if ((out_mem_type_ == OUT_SURFACE_MEM_DEV_INTERNAL) || (out_mem_type_ == OUT_SURFACE_MEM_NOT_MAPPED)) {
THROW("Output Memory Type is not supported");
ROCDEC_THROW("Output Memory Type is not supported", ROCDEC_INVALID_PARAMETER);
}
if (rocdec_parser_) {
rocDecDestroyVideoParser(rocdec_parser_); // need to do this here since it was already created in the base class
@@ -113,7 +113,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(int device_id, OutputSurfaceMemoryType ou
// start the FFMpeg decoding thread
ffmpeg_decoder_thread_ = new std::thread(&FFMpegVideoDecoder::DecodeThread, this);
if (!ffmpeg_decoder_thread_) {
THROW("FFMpegVideoDecoder create thread failed");
ROCDEC_THROW("FFMpegVideoDecoder create thread failed", -1);
}
}
}
@@ -192,7 +192,7 @@ int FFMpegVideoDecoder::HandleVideoSequence(RocdecVideoFormat *p_video_format) {
if (!dec_context_) {
dec_context_ = avcodec_alloc_context3(decoder_); //alloc dec_context_
if (!dec_context_) {
THROW("Could not allocate video codec context");
ROCDEC_THROW("Could not allocate video codec context", ROCDEC_RUNTIME_ERROR);
}
// set codec to automatically determine how many threads suits best for the decoding job
dec_context_->thread_count = 0;
@@ -206,7 +206,7 @@ int FFMpegVideoDecoder::HandleVideoSequence(RocdecVideoFormat *p_video_format) {
// open the codec
if (avcodec_open2(dec_context_, decoder_, NULL) < 0) {
THROW("Could not open codec");
ROCDEC_THROW("Could not open codec", ROCDEC_RUNTIME_ERROR);
}
// get the output pixel format from dec_context_
decoder_pixel_format_ = (dec_context_->pix_fmt == AV_PIX_FMT_NONE) ? AV_PIX_FMT_YUV420P : dec_context_->pix_fmt;