Additional logging in Htsp DataSource and Extractor

Author: kiall

app/src/main/java/ie/macinnes/tvheadend/player/HtspDataSource.java

@@ -78,6 +78,7 @@ public HtspDataSource createDataSource() {
 
     public HtspDataSource(Context context, SimpleHtspConnection connection, String streamProfile) {
         Log.d(TAG, "New HtspDataSource instantiated");
+
         mContext = context;
         mConnection = connection;
         mStreamProfile = streamProfile;
@@ -92,6 +93,7 @@ public HtspDataSource(Context context, SimpleHtspConnection connection, String s
     // DataSource Methods
     @Override
     public long open(DataSpec dataSpec) throws IOException {
+        Log.i(TAG, "Opening HTSP DataSource");
         mDataSpec = dataSpec;
 
         try {
@@ -154,6 +156,7 @@ public Uri getUri() {
 
     @Override
     public void close() throws IOException {
+        Log.i(TAG, "Closing HTSP DataSource");
         mIsOpen = false;
 
         mConnection.removeAuthenticationListener(mSubscriber);
@@ -166,20 +169,27 @@ public void close() throws IOException {
     // Subscription.Listener Methods
     @Override
     public void onSubscriptionStart(@NonNull HtspMessage message) {
+        Log.d(TAG, "Received subscriptionStart");
         serializeMessageToBuffer(message);
     }
 
     @Override
     public void onSubscriptionStatus(@NonNull HtspMessage message) {
+        Log.d(TAG, "Received subscriptionStatus");
         serializeMessageToBuffer(message);
     }
 
     @Override
     public void onSubscriptionStop(@NonNull HtspMessage message) {
-        Log.i(TAG, "Received subscriptionStop");
+        Log.d(TAG, "Received subscriptionStop");
         mIsOpen = false;
     }
 
+    @Override
+    public void onQueueStatus(@NonNull HtspMessage htspMessage) {
+
+    }
+
     @Override
     public void onMuxpkt(@NonNull HtspMessage message) {
         serializeMessageToBuffer(message);
@@ -204,7 +214,7 @@ private void serializeMessageToBuffer(@NonNull HtspMessage message) {
             mBuffer.flip();
         } catch (IOException e) {
             // Ignore?
-            Log.w(TAG, "IOException", e);
+            Log.w(TAG, "Caught IOException, ignoring", e);
         } finally {
             mLock.unlock();
             try {

app/src/main/java/ie/macinnes/tvheadend/player/HtspExtractor.java

@@ -94,6 +94,7 @@ public boolean sniff(ExtractorInput input) throws IOException, InterruptedExcept
 
     @Override
     public void init(ExtractorOutput output) {
+        Log.i(TAG, "Initializing HTSP Extractor");
         mOutput = output;
         mOutput.seekMap(new HtspSeekMap());
     }
@@ -120,9 +121,7 @@ public int read(ExtractorInput input, PositionHolder seekPosition) throws IOExce
             Log.w(TAG, "Class Not Found");
         } finally {
             try {
-                if (inputStream != null) {
-                    inputStream.close();
-                }
+                inputStream.close();
             } catch (IOException ex) {
                 // Ignore
             }
@@ -140,11 +139,12 @@ public int read(ExtractorInput input, PositionHolder seekPosition) throws IOExce
 
     @Override
     public void seek(long position, long timeUs) {
-
+        Log.d(TAG, "Seeking HTSP Extractor");
     }
 
     @Override
     public void release() {
+        Log.i(TAG, "Releasing HTSP Extractor");
         mStreamReaders.clear();
     }
 

app/src/main/java/ie/macinnes/tvheadend/tvinput/ExoPlayerSession.java

@@ -107,6 +107,8 @@ protected boolean playChannel(int tvhChannelId) {
         // Stop any existing playback
         stopPlayback();
 
+        Log.i(TAG, "Start playback of channel");
+
         SharedPreferences sharedPreferences = mContext.getSharedPreferences(
                 Constants.PREFERENCE_TVHEADEND, Context.MODE_PRIVATE);
 
@@ -126,6 +128,7 @@ protected boolean playChannel(int tvhChannelId) {
 
     @Override
     protected void stopPlayback() {
+        Log.i(TAG, "Stopping playback of channel");
         mExoPlayer.stop();
 
         if (mMediaSource != null) {