Merge pull request #192 from tobexyz/feat/issue187

feat: issue #187 selecting only media resources and try to choose alw…

Author: tobexyz

yaacc/src/main/java/de/yaacc/player/AVTransportPlayer.java

@@ -33,22 +33,29 @@
 import org.fourthline.cling.model.meta.Icon;
 import org.fourthline.cling.model.meta.RemoteDevice;
 import org.fourthline.cling.model.meta.Service;
+import org.fourthline.cling.model.types.UDAServiceType;
 import de.yaacc.upnp.callback.avtransport.GetPositionInfo;
 import de.yaacc.upnp.callback.avtransport.GetTransportInfo;
 import de.yaacc.upnp.callback.avtransport.Pause;
 import de.yaacc.upnp.callback.avtransport.Play;
 import de.yaacc.upnp.callback.avtransport.Seek;
 import de.yaacc.upnp.callback.avtransport.SetAVTransportURI;
 import de.yaacc.upnp.callback.avtransport.Stop;
+import de.yaacc.upnp.callback.connectionmanager.GetProtocolInfo;
 import org.fourthline.cling.support.contentdirectory.DIDLParser;
 import org.fourthline.cling.support.model.DIDLContent;
 import org.fourthline.cling.support.model.DIDLObject;
 import org.fourthline.cling.support.model.PositionInfo;
+import org.fourthline.cling.support.model.ProtocolInfo;
+import org.fourthline.cling.support.model.ProtocolInfos;
 import org.fourthline.cling.support.model.Res;
 import org.fourthline.cling.support.model.TransportInfo;
 import org.fourthline.cling.support.model.TransportState;
 import org.fourthline.cling.support.model.item.Item;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 import java.net.URI;
 import java.net.URL;
 import java.text.SimpleDateFormat;
@@ -182,11 +189,15 @@ protected Object loadItem(PlayableItem playableItem) {
     protected void startItem(PlayableItem playableItem, Object loadedItem) {
         if (playableItem == null || getDevice() == null)
             return;
-        YaaccLogger.d(getClass().getName(), "Uri: " + playableItem.getUri());
-        YaaccLogger.d(getClass().getName(), "Duration: " + playableItem.getDuration());
+        
+        // Try to select best resource for this device
+        PlayableItem deviceOptimizedItem = selectBestResourceForDevice(playableItem);
+        
+        YaaccLogger.d(getClass().getName(), "Uri: " + deviceOptimizedItem.getUri());
+        YaaccLogger.d(getClass().getName(), "Duration: " + deviceOptimizedItem.getDuration());
         YaaccLogger.d(getClass().getName(),
-                "MimeType: " + playableItem.getMimeType());
-        YaaccLogger.d(getClass().getName(), "Title: " + playableItem.getTitle());
+                "MimeType: " + deviceOptimizedItem.getMimeType());
+        YaaccLogger.d(getClass().getName(), "Title: " + deviceOptimizedItem.getTitle());
         Service<?, ?> service = getUpnpClient().getAVTransportService(getDevice());
         if (service == null) {
             YaaccLogger.d(getClass().getName(),
@@ -196,7 +207,103 @@ protected void startItem(PlayableItem playableItem, Object loadedItem) {
         }
 
         // Check transport state first and handle accordingly
-        checkTransportStateForStart(playableItem, service);
+        checkTransportStateForStart(deviceOptimizedItem, service);
+    }
+    
+    /**
+     * Select the best resource for this specific device based on supported protocols
+     */
+    private PlayableItem selectBestResourceForDevice(PlayableItem playableItem) {
+        Item item = playableItem.getItem();
+        if (item == null || item.getResources().isEmpty()) {
+            return playableItem;
+        }
+        
+        // Get device's supported protocols
+        Service<?, ?> cmService = getDevice().findService(new UDAServiceType("ConnectionManager"));
+        if (cmService == null) {
+            YaaccLogger.d(getClass().getName(), "No ConnectionManager service, using default resource");
+            return playableItem;
+        }
+        
+        // Query supported protocols synchronously
+        final ProtocolInfos[] supportedProtocols = new ProtocolInfos[1];
+        final CountDownLatch latch = new CountDownLatch(1);
+        
+        executorService.execute(
+            new GetProtocolInfo(cmService, getHttpRequestSender()) {
+                @Override
+                public void received(ActionInvocation actionInvocation, ProtocolInfos sinkProtocolInfos, ProtocolInfos sourceProtocolInfos) {
+                    supportedProtocols[0] = sinkProtocolInfos;
+                    latch.countDown();
+                }
+                
+                @Override
+                public void failure(ActionInvocation invocation, UpnpResponse operation, String defaultMsg) {
+                    YaaccLogger.d(AVTransportPlayer.class.getName(), "GetProtocolInfo failed: " + defaultMsg);
+                    latch.countDown();
+                }
+            }
+        );
+        
+        try {
+            latch.await(2, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            YaaccLogger.d(getClass().getName(), "GetProtocolInfo timeout");
+            return playableItem;
+        }
+        
+        if (supportedProtocols[0] == null || supportedProtocols[0].isEmpty()) {
+            YaaccLogger.d(getClass().getName(), "No supported protocols found, using default resource");
+            return playableItem;
+        }
+        
+        // Find best matching resource
+        Res bestMatch = null;
+        long bestBitrate = 0;
+        
+        for (Res resource : item.getResources()) {
+            if (resource.getProtocolInfo() == null) continue;
+            
+            String contentFormat = resource.getProtocolInfo().getContentFormat();
+            if (contentFormat == null || contentFormat.isEmpty()) continue;
+            
+            // Check if device supports this format
+            boolean supported = false;
+            for (ProtocolInfo deviceProtocol : supportedProtocols[0]) {
+                if (deviceProtocol.getContentFormat().equals(contentFormat) ||
+                    deviceProtocol.getContentFormat().equals("*") ||
+                    deviceProtocol.getContentFormat().startsWith(contentFormat.split("/")[0] + "/*")) {
+                    supported = true;
+                    break;
+                }
+            }
+            
+            if (!supported) {
+                YaaccLogger.d(getClass().getName(), "Device doesn't support: " + contentFormat);
+                continue;
+            }
+            
+            // Among supported formats, prefer higher bitrate
+            Long bitrate = resource.getBitrate();
+            if (bitrate != null && bitrate > bestBitrate) {
+                bestBitrate = bitrate;
+                bestMatch = resource;
+            } else if (bestMatch == null) {
+                bestMatch = resource;
+            }
+        }
+        
+        if (bestMatch != null && !bestMatch.equals(item.getFirstResource())) {
+            YaaccLogger.d(getClass().getName(), "Selected device-optimized resource: " + 
+                bestMatch.getProtocolInfo().getContentFormat() + " bitrate: " + bestMatch.getBitrate());
+            // Create new PlayableItem with selected resource
+            Item optimizedItem = new Item(item);
+            optimizedItem.setResources(java.util.Collections.singletonList(bestMatch));
+            return new PlayableItem(optimizedItem, (int) playableItem.getDuration());
+        }
+        
+        return playableItem;
     }
 
     private void checkTransportStateForStart(PlayableItem playableItem, Service<?, ?> service) {

yaacc/src/main/java/de/yaacc/player/PlayableItem.java

@@ -46,7 +46,7 @@ public PlayableItem(Item item, int defaultDuration) {
         this.item = item;
         id = UUID.randomUUID();
         setTitle(item.getTitle());
-        Res resource = item.getFirstResource();
+        Res resource = selectBestResource(item);
         if (resource != null) {
             setUri(Uri.parse(resource.getValue()));
             String mimeType = resource.getProtocolInfo().getContentFormat();
@@ -100,6 +100,51 @@ public PlayableItem() {
         id = UUID.randomUUID();
     }
 
+    /**
+     * Select the best playable resource from an item.
+     * Filters out non-media types and prefers higher quality.
+     */
+    private Res selectBestResource(Item item) {
+        if (item.getResources() == null || item.getResources().isEmpty()) {
+            return null;
+        }
+        
+        Res bestResource = null;
+        long bestBitrate = 0;
+        
+        for (Res resource : item.getResources()) {
+            String contentFormat = resource.getProtocolInfo().getContentFormat();
+            if (contentFormat == null || contentFormat.isEmpty()) {
+                continue;
+            }
+            
+            // Only accept audio, video, or image types
+            if (!contentFormat.startsWith("audio/") && 
+                !contentFormat.startsWith("video/") && 
+                !contentFormat.startsWith("image/")) {
+                YaaccLogger.d(getClass().getName(), "Skipping non-media resource: " + contentFormat);
+                continue;
+            }
+            
+            // Prefer higher bitrate
+            Long bitrate = resource.getBitrate();
+            if (bitrate != null && bitrate > bestBitrate) {
+                bestBitrate = bitrate;
+                bestResource = resource;
+            } else if (bestResource == null) {
+                bestResource = resource;
+            }
+        }
+        
+        if (bestResource != null) {
+            YaaccLogger.d(getClass().getName(), "Selected resource: " + 
+                bestResource.getProtocolInfo().getContentFormat() + 
+                " bitrate: " + bestResource.getBitrate());
+        }
+        
+        return bestResource;
+    }
+
 
     /**
      * @return the mimeType