Add user-specific resolution handling and logging for encoding

Author: Daniel Neto

objects/Format.php

@@ -557,6 +557,65 @@ public static function getAvailableResolutionsInfo()
             return $resolutions;
         }
 
+        /**
+         * Get available resolutions info with user group restrictions applied
+         * Shows only the resolutions that will actually be encoded for the current user
+         * @return array Array of resolution info considering user restrictions
+         */
+        public static function getAvailableResolutionsInfoForUser()
+        {
+            $resolutions = [];
+            $availableResolutions = Format::getAvailableResolutions();
+
+            // Get the final resolutions that will be used for encoding (with user restrictions)
+            $finalResolutions = self::getSelectedResolutionsWithUserRestrictions();
+
+            foreach ($availableResolutions as $key => $resolution) {
+                // Check if this resolution will actually be encoded for the current user
+                $resolutionWillBeEncoded = (array_search($resolution, $finalResolutions, true) !== false);
+
+                if (!$resolutionWillBeEncoded) {
+                    continue; // Skip resolutions that won't be encoded
+                }
+
+                $label = "<span class='label label-";
+
+                // Different color based on user permissions
+                require_once __DIR__ . '/Login.php';
+                $userAllowedResolutions = Login::getAllowedResolutions();
+
+                if (empty($userAllowedResolutions) || in_array($resolution, $userAllowedResolutions)) {
+                    $label .= "success"; // Green for allowed resolutions
+                } else {
+                    $label .= "default"; // Gray for encoder-only resolutions
+                }
+
+                $label .= "'>{$resolution}p ";
+
+                // Add quality indicators
+                if ($resolution == 720) {
+                    $label .= '<span class="label label-danger">HD</span>';
+                } elseif ($resolution == 1080) {
+                    $label .= '<span class="label label-danger">FHD</span>';
+                } elseif ($resolution == 1440) {
+                    $label .= '<span class="label label-danger">FHD+</span>';
+                } elseif ($resolution == 2160) {
+                    $label .= '<span class="label label-danger">4K</span>';
+                }
+                $label .= " </span>";
+
+                $resolutions[] = array(
+                    'resolutionChecked' => 'checked', // All returned resolutions will be encoded
+                    'label' => $label,
+                    'resolution' => $resolution,
+                );
+            }
+
+            _error_log("Format::getAvailableResolutionsInfoForUser - Final resolutions for display: " . json_encode(array_column($resolutions, 'resolution')));
+
+            return $resolutions;
+        }
+
         public static function sanitizeResolutions($resolutions)
         {
             if (is_array($resolutions)) {
@@ -609,6 +668,58 @@ private static function getSelectedResolutions()
             return $result;
         }
 
+        /**
+         * Get final resolutions to encode based on user restrictions and encoder settings
+         * @param array|null $userAllowedResolutions Resolutions from login response
+         * @param array $encoderEnabledResolutions Resolutions enabled in encoder
+         * @return array Final resolutions to use
+         */
+        private static function getFinalResolutions($userAllowedResolutions, $encoderEnabledResolutions) {
+            // Se não há restrições do usuário, usar as do encoder
+            if (empty($userAllowedResolutions) || !is_array($userAllowedResolutions)) {
+                _error_log("Format::getFinalResolutions - No user restrictions, using encoder resolutions: " . json_encode($encoderEnabledResolutions));
+                return $encoderEnabledResolutions;
+            }
+
+            // Calcular intersecção (apenas as que estão em ambos)
+            $finalResolutions = array_intersect($userAllowedResolutions, $encoderEnabledResolutions);
+
+            // Se não há nenhuma resolução em comum, usar as do encoder (fallback)
+            if (empty($finalResolutions)) {
+                _error_log("Format::getFinalResolutions - No intersection, fallback to encoder resolutions. User: " . json_encode($userAllowedResolutions) . " Encoder: " . json_encode($encoderEnabledResolutions));
+                return $encoderEnabledResolutions;
+            }
+
+            // Remover duplicatas e ordenar
+            $finalResolutions = array_unique($finalResolutions);
+            sort($finalResolutions);
+
+            _error_log("Format::getFinalResolutions - Final resolutions after filtering. User: " . json_encode($userAllowedResolutions) . " Encoder: " . json_encode($encoderEnabledResolutions) . " Final: " . json_encode($finalResolutions));
+
+            return $finalResolutions;
+        }
+
+        /**
+         * Get selected resolutions with user group restrictions applied
+         * @return array Final resolutions to use for encoding
+         */
+        private static function getSelectedResolutionsWithUserRestrictions()
+        {
+            // Get encoder configured resolutions
+            $encoderResolutions = self::getSelectedResolutions();
+
+            // Get user allowed resolutions from login session
+            require_once __DIR__ . '/Login.php';
+            $userAllowedResolutions = Login::getAllowedResolutions();
+
+            // Apply user restrictions
+            $finalResolutions = self::getFinalResolutions($userAllowedResolutions, $encoderResolutions);
+
+            _error_log("Format::getSelectedResolutionsWithUserRestrictions - User allowed: " . json_encode($userAllowedResolutions) . " Encoder enabled: " . json_encode($encoderResolutions) . " Final: " . json_encode($finalResolutions));
+
+            return $finalResolutions;
+        }
+
         static function loadEncoderConfiguration()
         {
             $availableConfiguration = self::getAvailableConfigurations();
@@ -618,7 +729,8 @@ static function loadEncoderConfiguration()
             $audioBitrate = [];
             $videoFramerate = [];
 
-            $selectedResolutions = self::getSelectedResolutions();
+            // Use the new method that applies user group restrictions
+            $selectedResolutions = self::getSelectedResolutionsWithUserRestrictions();
 
             sort($selectedResolutions);
 
@@ -631,6 +743,13 @@ static function loadEncoderConfiguration()
                 array_push($videoFramerate, $availableConfiguration["videoFramerate"][$key]);
             }
 
+            _error_log("Format::loadEncoderConfiguration - Final encoder config: " . json_encode(array(
+                "resolutions" => $resolutions,
+                "bandwidth" => $bandwidth,
+                "audioBitrate" => $audioBitrate,
+                "videoFramerate" => $videoFramerate
+            )));
+
             return array(
                 "resolutions" => $resolutions,
                 "bandwidth" => $bandwidth,

objects/Login.php

@@ -13,10 +13,10 @@ private static function modifyUrl($url) {
             if (strpos($url, '/live?p=') !== false) {
                 $parsedUrl = parse_url($url);
                 $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
-                
+
                 // Remove everything after the last '/' before '/live?p='
                 $path = substr($path, 0, strrpos($path, '/live?p='));
-                
+
                 return $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $path . '/';
             }
             return $url;
@@ -246,6 +246,23 @@ static function getStreamerId() {
             return intval($_SESSION['login']->streamers_id);
         }
 
+        /**
+         * Get allowed resolutions for the logged user from login session
+         * @return array|null Array of allowed resolutions or null if not set
+         */
+        static function getAllowedResolutions() {
+            if (!static::isLogged()) {
+                return null;
+            }
+
+            // Check if allowedResolutions exists in session
+            if (!empty($_SESSION['login']->allowedResolutions) && is_array($_SESSION['login']->allowedResolutions)) {
+                return $_SESSION['login']->allowedResolutions;
+            }
+
+            return null;
+        }
+
     }
 
-}
+}

view/index_shareVideos.php

@@ -62,7 +62,7 @@
                             ?>
                             <div class="form-group">
                                 <div style="display: flex;">
-                                    <?php 
+                                    <?php
                                     echo getCategoriesSelect('download_categories_id');
                                     ?>
                                 </div>
@@ -113,7 +113,7 @@
                         ?>
                         <div class="form-group">
                             <div style="display: flex;">
-                                <?php 
+                                <?php
                                 echo getCategoriesSelect('bulk_categories_id');
                                 ?>
                             </div>
@@ -131,13 +131,18 @@
     <div class="panel-footer">
         <div class="availableResolutionsLabels">
             <?php
-            $resolutionsInfo = Format::getAvailableResolutionsInfo();
+            // Show resolutions that will actually be encoded for this user
+            $resolutionsInfo = Format::getAvailableResolutionsInfoForUser();
 
-            foreach ($resolutionsInfo as $value) {
-                if (empty($value['resolutionChecked'])) {
-                    continue;
+            if (!empty($resolutionsInfo)) {
+                foreach ($resolutionsInfo as $value) {
+                    if (empty($value['resolutionChecked'])) {
+                        continue;
+                    }
+                    echo $value['label'] . ' ';
                 }
-                echo $value['label'];
+            } else {
+                echo '<small class="text-warning">' . __('No resolutions available for encoding') . '</small>';
             }
             ?>
         </div>