wip

Author: skidder

avcodec.cpp

@@ -39,7 +39,7 @@ extern AVCodec ff_vorbis_decoder;
 
 void avcodec_init()
 {
-    av_log_set_level(AV_LOG_INFO);
+    av_log_set_level(AV_LOG_ERROR);
 }
 
 struct avcodec_decoder_struct {
@@ -228,7 +228,6 @@ avcodec_decoder avcodec_decoder_create(const opencv_mat buf, const bool hevc_ena
     }
 
     const AVCodec* codec = avcodec_find_decoder(codec_params->codec_id);
-    
     if (!codec) {
         avcodec_decoder_release(d);
         return NULL;
@@ -252,16 +251,6 @@ avcodec_decoder avcodec_decoder_create(const opencv_mat buf, const bool hevc_ena
         return NULL;
     }
 
-    // Configure AV1 decoder for software-only decoding
-    if (codec->id == AV_CODEC_ID_AV1) {
-        // Explicitly disable hardware acceleration to prevent format errors
-        d->codec->hw_device_ctx = NULL;
-        d->codec->hwaccel_context = NULL;
-        d->codec->hwaccel = NULL;
-        d->codec->get_format = NULL; // Use default software format selection
-        d->codec->thread_count = 0;  // Let FFmpeg choose optimal thread count
-    }
-
     res = avcodec_open2(d->codec, codec, NULL);
     if (res < 0) {
         avcodec_decoder_release(d);
@@ -348,11 +337,16 @@ int avcodec_decoder_get_orientation(const avcodec_decoder d)
     }
     else {
         uint8_t* displaymatrix = NULL;
-        size_t side_data_size = 0;
-
-        // Get side data from stream
-        AVStream* stream = d->container->streams[d->video_stream_index];
-        displaymatrix = av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, &side_data_size);
+        const AVPacketSideData* sd = NULL;
+
+        // access side data from codecpar instead of directly from the stream
+        AVCodecParameters* codecpar = d->container->streams[d->video_stream_index]->codecpar;
+        for (int i = 0; i < codecpar->nb_coded_side_data; i++) {
+            if (codecpar->coded_side_data[i].type == AV_PKT_DATA_DISPLAYMATRIX) {
+                sd = &codecpar->coded_side_data[i];
+                break;
+            }
+        }
 
         if (displaymatrix) {
             rotation = (360 - (int)(av_display_rotation_get((const int32_t*)displaymatrix))) % 360;
@@ -421,7 +415,7 @@ bool avcodec_decoder_has_subtitles(const avcodec_decoder d)
 
 static int avcodec_decoder_copy_frame(const avcodec_decoder d, opencv_mat mat, AVFrame* frame)
 {
-    if (!d || !d->codec || !mat || !frame) {
+    if (!d || !d->codec || !d->codec->codec || !mat || !frame) {
         return -1;
     }
 
@@ -430,11 +424,6 @@ static int avcodec_decoder_copy_frame(const avcodec_decoder d, opencv_mat mat, A
         return -1;
     }
 
-    // Extra safety check for AV1 decoder context
-    if (!d->codec->codec) {
-        return AVERROR(EINVAL);
-    }
-    
     int res = avcodec_receive_frame(d->codec, frame);
     if (res >= 0) {
         // Calculate the step size based on the cv::Mat's width
@@ -527,18 +516,10 @@ static int avcodec_decoder_decode_packet(const avcodec_decoder d, opencv_mat mat
 
 bool avcodec_decoder_decode(const avcodec_decoder d, opencv_mat mat)
 {
-    if (!d) {
-        return false;
-    }
-    if (!d->container) {
-        return false;
-    }
-    if (!d->codec) {
-        return false;
-    }
-    if (!mat) {
+    if (!d || !d->container || !d->codec || !mat) {
         return false;
     }
+
     AVPacket packet;
     bool done = false;
     bool success = false;

deps/build-deps-linux.sh

@@ -387,7 +387,7 @@ echo '\n--------------------'
 echo 'Building ffmpeg'
 echo '--------------------\n'
 mkdir -p $BASEDIR/ffmpeg
-tar -xjf $SRCDIR/ffmpeg-5.1.1.tar.bz2 -C $BASEDIR/ffmpeg --strip-components 1
+tar -xJf $SRCDIR/ffmpeg-7.0.2.orig.tar.xz -C $BASEDIR/ffmpeg --strip-components 1
 mkdir -p $BUILDDIR/ffmpeg
 cd $BUILDDIR/ffmpeg
 export PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"

third-party-licenses/dav1d.txt

@@ -0,0 +1,23 @@
+Copyright © 2018-2019, VideoLAN and dav1d authors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third-party-licenses/lcms.txt

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2023 Marti Maria Saguer
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be 
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

third-party-licenses/libaom.txt

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Alliance for Open Media. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+

third-party-licenses/libyuv.txt

@@ -0,0 +1,29 @@
+Copyright 2011 The LibYuv Project Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.