Commit f782d43e authored by lintervo's avatar lintervo
Browse files

Merge remote-tracking branch 'origin/main' into nokia/object-editing-interface

parents ab30f7dc 95fed5b1
Loading
Loading
Loading
Loading
Loading
+1 −15
Original line number Diff line number Diff line
@@ -1164,20 +1164,6 @@ int16_t ISAR_POST_REND_GetRenderConfig(
    }

    hRCin = hIvasRend->splitRenderConfig;
#ifdef DEBUGGING
    switch ( hRCin->renderer_type_override )
    {
        case IVAS_RENDER_TYPE_OVERRIDE_CREND:
            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND;
            break;
        case IVAS_RENDER_TYPE_OVERRIDE_FASTCONV:
            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV;
            break;
        default:
            hRCout->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE;
            break;
    }
#endif

    splitRenderConfig->splitRendBitRate = SPLIT_REND_768k;
    splitRenderConfig->dof = 3;
@@ -1804,7 +1790,7 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader(
 *-------------------------------------------------------------------*/

int32_t ISAR_POST_REND_GetNoCLipping(
    IVAS_REND_CONST_HANDLE hIvasRend )
    ISAR_POST_REND_HANDLE hIvasRend )
{
    return hIvasRend->numClipping;
}
+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader(

#ifdef DEBUGGING
int32_t ISAR_POST_REND_GetNoCLipping(
    IVAS_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */
    ISAR_POST_REND_HANDLE hIvasRend                /* i  : Renderer handle                                     */
);

int32_t ISAR_POST_REND_GetCntFramesLimited(
    IVAS_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */
    ISAR_POST_REND_CONST_HANDLE hIvasRend                /* i  : Renderer handle                                     */
);
#endif