Skip to content

Improved oapv_version function #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkozinski merged 2 commits into from
Jun 9, 2025
Merged

Improved oapv_version function #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c44b979
support 4-byte version number
kpchoi Jun 9, 2025
40b5eb2
added error handling code in oapv_version
kpchoi Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/oapv_app_dec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,11 @@ int main(int argc, const char **argv)
memset(&ofrms, 0, sizeof(oapv_frms_t));

// print logo
char version[16];
oapv_version(version, sizeof(version));

logv2(" ____ ___ ___ _ __\n");
logv2(" / __ \\___ ___ ___ / _ | / _ \\ | / / Decoder (v%s)\n", oapv_version());
logv2(" / __ \\___ ___ ___ / _ | / _ \\ | / / Decoder (v%s)\n", version);
logv2("/ /_/ / _ \\/ -_) _ \\/ __ |/ ___/ |/ / \n");
logv2("\\____/ .__/\\__/_//_/_/ |_/_/ |___/ \n");
logv2(" /_/ \n");
Expand Down
5 changes: 4 additions & 1 deletion app/oapv_app_enc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,11 @@ int main(int argc, const char **argv)
const int num_frames = MAX_NUM_FRMS; // number of frames in an access unit

// print logo
char version[16];
oapv_version(version, sizeof(version));

logv2(" ____ ___ ___ _ __\n");
logv2(" / __ \\___ ___ ___ / _ | / _ \\ | / / Encoder (v%s)\n", oapv_version());
logv2(" / __ \\___ ___ ___ / _ | / _ \\ | / / Encoder (v%s)\n", version);
logv2("/ /_/ / _ \\/ -_) _ \\/ __ |/ ___/ |/ / \n");
logv2("\\____/ .__/\\__/_//_/_/ |_/_/ |___/ \n");
logv2(" /_/ \n");
Expand Down
3 changes: 2 additions & 1 deletion inc/oapv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,8 @@ OAPV_EXPORT int oapvd_info(void *au, int au_size, oapv_au_info_t *aui);
/*****************************************************************************
* openapv version
*****************************************************************************/
OAPV_EXPORT const char *oapv_version(void);
OAPV_EXPORT unsigned int oapv_version(char *ver, int size);


#ifdef __cplusplus
} /* extern "C" */
Expand Down
15 changes: 10 additions & 5 deletions src/oapv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2153,10 +2153,15 @@ int oapvd_info(void *au, int au_size, oapv_au_info_t *aui)
#endif // ENABLE_DECODER
///////////////////////////////////////////////////////////////////////////////

const char *oapv_version(void)
unsigned int oapv_version(char *ver, int size)
{
static char oapv_version_string[16];
snprintf(oapv_version_string, sizeof(oapv_version_string), "%d.%d.%d.%d",
OAPV_VER_APISET, OAPV_VER_MAJOR, OAPV_VER_MINOR, OAPV_VER_PATCH);
return (char*)oapv_version_string;
if(ver != NULL) {
int written = snprintf(ver, size, "%d.%d.%d.%d",
OAPV_VER_APISET, OAPV_VER_MAJOR, OAPV_VER_MINOR, OAPV_VER_PATCH);
// check if snprintf encountered an error or if the output was truncated.
if (written < 0 || written >= size) {
return OAPV_ERR_INVALID_ARGUMENT;
}
}
return OAPV_VER_NUM;
}