Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c211196 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: Replace strtok with thread safe strtok_r method" into main am:... 

Merge "CCodec: Replace strtok with thread safe strtok_r method" into main am: 7560aee2 am: fdfadb5e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3235545



Change-Id: Ib9b193b477eeba03ccc556f84e1cea54265f5aed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5e0d478 fdfadb5e

media/codec2/sfplugin/CCodecConfig.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1896,7 +1896,8 @@ ReflectedParamUpdater::Dict CCodecConfig::getReflectedFormat( 
                std::vector<C2QpOffsetRectStruct> c2QpOffsetRects;

                char mutableStrQpOffsetRects[strlen(qpOffsetRects.c_str()) + 1];

                strcpy(mutableStrQpOffsetRects, qpOffsetRects.c_str());

                char* box = strtok(mutableStrQpOffsetRects, ";");

                char* savePtr;

                char* box = strtok_r(mutableStrQpOffsetRects, ";", &savePtr);

                while (box != nullptr) {

                    int top, left, bottom, right, offset;

                    if (sscanf(box, "%d,%d-%d,%d=%d", &top, &left, &bottom, &right, &offset) == 5) {
@@ -1914,7 +1915,7 @@ ReflectedParamUpdater::Dict CCodecConfig::getReflectedFormat( 
                    } else {

                        ALOGE("Rects configuration %s doesn't follow the string pattern.", box);

                    }

                    box = strtok(nullptr, ";");

                    box = strtok_r(nullptr, ";", &savePtr);

                }

                if (c2QpOffsetRects.size() != 0) {

                    const std::unique_ptr<C2StreamQpOffsetRects::output> regions =