Skip to content
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.

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

rem/aufile: test and fix aufile_set_position nread #1010

Merged
merged 5 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions rem/aufile/aufile.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,12 @@ int aufile_set_position(struct aufile *af, const struct aufile_prm *prm,
off_t pos = (off_t)(prm->srate * aufmt_sample_size(prm->fmt)
* prm->channels * pos_ms / 1000);

pos = min((off_t)datasize, pos);
Copy link
Collaborator

@cspiel1 cspiel1 Nov 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SEEK_CUR sets the position relative to the current position.

What is datasize after wav_header_decode() returns?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The size of the data chunk, i.e. the size of the PCM data in bytes.

Copy link
Contributor Author

@larsimmisch larsimmisch Nov 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The datasize was 1082 instead of 1072 - the file was 67.625 ms long. I've cut it to 67ms exactly now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why the windows tests are failing, I'll try to reproduce

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The datasize was 1082 instead of 1072 - the file was 67.625 ms long. I've cut it to 67ms exactly now

So, now you fixed the WAV file? Shouldn't we test that it doesn't read too far?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that seemed simpler than fixing the test (i.e. allowing that less than 1ms can be read).

I can extend the test to make sure we don't read too far, that would make sense too.


if (fseek(af->f, pos, SEEK_CUR) < 0)
return errno;

af->nread = pos;

return 0;
}
1 change: 1 addition & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ set(SRCS
aubuf.c
aulength.c
aulevel.c
aupos.c
auresamp.c
av1.c
base64.c
Expand Down
61 changes: 61 additions & 0 deletions test/aupos.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/**
* @file src/aupos.c audio file setposition test
*
* Copyright (C) 2023 Lars Immisch
*/

#include <re.h>
#include <rem.h>
#include "test.h"


#define DEBUG_MODULE "auposition"
#define DEBUG_LEVEL 5
#include <re_dbg.h>


int test_auposition(void)
{
struct aufile *af = NULL;
struct aufile_prm prm;
char path[256];
uint8_t buffer[512];

re_snprintf(path, sizeof(path), "%s/beep.wav", test_datapath());

int err = aufile_open(&af, &prm, path, AUFILE_READ);
TEST_ERR(err);

err = aufile_set_position(af, &prm, 67);
TEST_ERR(err);

/* That file is exactly 67 ms long, so we shouldn't read anything */
size_t size = sizeof(buffer);
err = aufile_read(af, buffer, &size);
TEST_ERR(err);

/* It's possible we read data up to a ms */
TEST_ASSERT(size < 16);

af = mem_deref(af);

err = aufile_open(&af, &prm, path, AUFILE_READ);
TEST_ERR(err);

err = aufile_set_position(af, &prm, 37);
TEST_ERR(err);

size = sizeof(buffer);
err = aufile_read(af, buffer, &size);
TEST_ERR(err);

/* 30 ms should be left, at 8000Hz/s, one channels and 16 bit samples
that's 480 bytes */
TEST_ASSERT(size - 480 < 16);


out:
mem_deref(af);

return err;
}
Binary file modified test/data/beep.wav
Binary file not shown.
1 change: 1 addition & 0 deletions test/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static const struct test tests[] = {
TEST(test_aubuf),
TEST(test_aulength),
TEST(test_aulevel),
TEST(test_auposition),
TEST(test_auresamp),
TEST(test_async),
TEST(test_av1),
Expand Down
1 change: 1 addition & 0 deletions test/test.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ int test_aes_gcm(void);
int test_aubuf(void);
int test_aulevel(void);
int test_aulength(void);
int test_auposition(void);
int test_auresamp(void);
int test_async(void);
int test_av1(void);
Expand Down
Loading