History

Merge pull request #1614 from sijchen/fix_idr_id1

[Encoder] fix idr_id: idr_id should be adding regardless of the sps strategy

ruil2 committed 11 years ago

Commit ec998192 parents 3be8ae7 32d61936 files · +15 −14Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 6 files). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+4−4
@@ -561,7 +561,7 @@ TEST_P (EncodeDecodeTestAPI, GetOptionIDR) { · 560 unmodified lines
561561 EncodeOneFrame (0);
562562
563563 if (info.eFrameType == videoFrameTypeIDR) {
564− iEncCurIdrPicId = (iSpsPpsIdAddition == 0) ? 0 : (iEncCurIdrPicId + 1);
564+ iEncCurIdrPicId = iEncCurIdrPicId + 1;
565565 }
566566 //decoding after each encoding frame
567567 int len = 0;
@@ -2321,9 +2321,9 @@ const uint32_t kiFrameRate = 12; //DO NOT CHANGE! · 1753 unmodified lines
23212321 const uint32_t kiFrameNum = 100; //DO NOT CHANGE!
23222322 const uint32_t kiMaxBsSize = 10000000; //DO NOT CHANGE!
23232323 const char* pHashStr[] = { //DO NOT CHANGE!
2324− "c58322f886a3ba958c6f60b46b98f67b5d860866",
2325− "f2799e1e5f6e33c6274f4e1f6273c721475492d0",
2326− "8f0fafeaa2746e04d42fb17104efb61c9dbd1a6f"
2324+ "be28b28101023f92b0c994fc63531890d28307d0",
2325+ "3be320b5af1164cb88519b214e4698f11b3e4eb1",
2326+ "4ed8aa9a107119ff7b1a8821dc757ccc343ffd0b"
23272327 };
23282328
23292329 class DecodeParseAPI : public EncodeDecodeTestBase {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t