Code clean up - remove unused headers from demuxer, unused ffmpeg dependencies, and redundent info from videodecode sample (#71)

README.md

@@ -74,7 +74,7 @@ The tool provides a few samples to decode videos [here](samples/). Please refer
 
 * [FFMPEG](https://ffmpeg.org/about.html) - required to run sample applications & make test
   ```
-  sudo apt install ffmpeg libavcodec-dev libavformat-dev libswscale-dev
+  sudo apt install ffmpeg
   ```
 
 ## Docker:

rocDecode-setup.py

@@ -115,7 +115,7 @@ os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' +
 if "Ubuntu" in platfromInfo:
     os.system('sudo -v')
     os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
-              ' install vainfo libva-dev libdrm-dev ffmpeg libavcodec-dev libavformat-dev libswscale-dev')
+              ' install vainfo libva-dev libdrm-dev ffmpeg')
 else:
     os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
               ' install autoconf automake bzip2 bzip2-devel freetype-devel')
@@ -145,7 +145,7 @@ else:
                   ' install libass-devel')
         os.system('sudo -v')
         os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
-                  ' install ffmpeg libavcodec-devel libavformat-devel libswscale-devel')
+                  ' install ffmpeg')
     elif "centos-8" in platfromInfo or "redhat-8" in platfromInfo:
         # el8 x86_64 packages
         os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +

samples/videoDecode/CMakeLists.txt

@@ -57,7 +57,7 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND)
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device)
     # FFMPEG
     include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR}
-                      ${SWSCALE_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR})
+                        ${AVFORMAT_INCLUDE_DIR})
     set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES})
     # rocDecode
     include_directories (${ROCDECODE_INCLUDE_DIR})

samples/videoDecode/README.md

@@ -18,7 +18,7 @@ This sample supports both YUV420 8-bit and 10-bit streams.
 
 * [FFMPEG](https://ffmpeg.org/about.html)
   ```
-  sudo apt install ffmpeg libavcodec-dev libavformat-dev libswscale-dev
+  sudo apt install ffmpeg
   ```
 
 ## Build

samples/videoDecode/videodecode.cpp

@@ -149,10 +149,6 @@ int main(int argc, char **argv) {
             n_frame += n_frame_returned;
         } while (n_video_bytes);
 
-        std::cout << "info: Video codec format: " << viddec.GetCodecFmtName(viddec.GetCodecId()) << std::endl;
-        std::cout << "info: Video size: [ " << surf_info->output_width << ", " << surf_info->output_height << " ]" << std::endl;
-        std::cout << "info: Video surface format: " << viddec.GetSurfaceFmtName(surf_info->surface_format) << std::endl;
-        std::cout << "info: Video Bit depth: " << surf_info->bit_depth << std::endl;
         std::cout << "info: Total frame decoded: " << n_frame << std::endl;
         if (!dump_output_frames) {
             std::cout << "info: avg decoding time per frame (ms): " << total_dec_time / n_frame << std::endl;

samples/videoDecodeFork/README.md

@@ -20,7 +20,7 @@ This sample uses fork() to create multiple processes to decode the same input vi
 
 * [FFMPEG](https://ffmpeg.org/about.html)
   ```
-  sudo apt install ffmpeg libavcodec-dev libavformat-dev libswscale-dev
+  sudo apt install ffmpeg
   ```
 
 ## Build

samples/videoDecodePerf/README.md

@@ -20,7 +20,7 @@ This sample uses multiple threads to decode the same input video parallely.
 
 * [FFMPEG](https://ffmpeg.org/about.html)
   ```
-  sudo apt install ffmpeg libavcodec-dev libavformat-dev libswscale-dev
+  sudo apt install ffmpeg
   ```
 
 ## Build

utils/video_demuxer.h

@@ -26,17 +26,12 @@ THE SOFTWARE.
 extern "C" {
     #include <libavcodec/avcodec.h>
     #include <libavformat/avformat.h>
-    #include <libavutil/pixdesc.h>
-    #include <libavutil/hwcontext.h>
-    #include <libavutil/hwcontext_vaapi.h>
-    #include <va/va.h>
-    #include <va/va_drmcommon.h>
 }
 
 #include "rocdecode.h"
 /*!
  * \file
- * \brief The AMD Video Demuxer for  rocDecode Library.
+ * \brief The AMD Video Demuxer for rocDecode Library.
  *
  * \defgroup group_amd_rocdecode_videodemuxer videoDemuxer: AMD rocDecode Video Demuxer API
  * \brief AMD The rocDecode Video Demuxer API.